Bug#869965: vim: please add syntax highlighting for debian/copyright files

2017-08-13 Thread Chris Lamb
Hi James,

> > +" Vim syntax file
> > +" Language:Debian copyright file
> > +" Maintainer:  Chris Lamb 
> 
> Do you want to maintain this under the umbrella of pkg-vim-maintainers?

That's very tempting but I'm very happy to let you handle it. My vim-foo
is just too weak, alas...

> If not, I'd prefer having you send this upstream since Bram will only
> accept updates from the Maintainer.

Please update the maintainer field to whatever works for you/Bram. :) I
didn't realise the field was more than "just" text.

> What do you think about handling single-line vs. multi-line fields, like
> in debcontrol.vim?

We support that in debcontrol.vim? Nice. Again, my vim-foo (or eyesight)
didn't notice that. Again, please feel absolutely free to update and
improve, etc.


Best wishes,

-- 
  ,''`.
 : :'  : Chris Lamb
 `. `'`  la...@debian.org / chris-lamb.co.uk
   `-



Bug#869965: vim: please add syntax highlighting for debian/copyright files

2017-08-13 Thread James McCoy
On Fri, Jul 28, 2017 at 09:10:57AM +0100, Chris Lamb wrote:
> A patch is attached that adds simple syntax highlighting for
> DEP-5 debian/copyright files.

Thanks!

> diff --git a/runtime/syntax/debcopyright.vim b/runtime/syntax/debcopyright.vim
> new file mode 100644
> index 000..dd34be4
> --- /dev/null
> +++ b/runtime/syntax/debcopyright.vim
> @@ -0,0 +1,32 @@
> +" Vim syntax file
> +" Language:Debian copyright file
> +" Maintainer:  Chris Lamb 

Do you want to maintain this under the umbrella of pkg-vim-maintainers?
I'd be glad to add you to the team. :)

If not, I'd prefer having you send this upstream since Bram will only
accept updates from the Maintainer.

> +syn match debcopyrightUrl   
> "\vhttps?://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?$"
> +syn match debcopyrightKey   
> "^\%(Format\|Upstream-Name\|Upstream-Contact\|Disclaimer\|Source\|Comment\|Files\|Copyright\|License\):
>  *"

What do you think about handling single-line vs. multi-line fields, like
in debcontrol.vim?

Cheers,
-- 
James
GPG Key: 4096R/91BF BF4D 6956 BD5D F7B7  2D23 DFE6 91AE 331B A3DB



Bug#869965: vim: please add syntax highlighting for debian/copyright files

2017-07-28 Thread Chris Lamb
Source: vim
Version: 2:8.0.0197-5
Severity: normal
Tags: patch

Hi,

A patch is attached that adds simple syntax highlighting for
DEP-5 debian/copyright files.


Regards,

-- 
  ,''`.
 : :'  : Chris Lamb, Debian Project Leader
 `. `'`  la...@debian.org / chris-lamb.co.uk
   `-
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 9c9c808..b1f916d 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -592,6 +592,13 @@ au BufNewFile,BufRead control
\|   setf debcontrol
\| endif
 
+" Debian Copyright
+au BufNewFile,BufRead */debian/copyright   setf debcopyright
+au BufNewFile,BufRead copyright
+   \  if getline(1) =~ '^Format:'
+   \|   setf debcopyright
+   \| endif
+
 " Debian Sources.list
 au BufNewFile,BufRead */etc/apt/sources.list   setf debsources
 au BufNewFile,BufRead */etc/apt/sources.list.d/*.list  setf debsources
diff --git a/runtime/syntax/debcopyright.vim b/runtime/syntax/debcopyright.vim
new file mode 100644
index 000..dd34be4
--- /dev/null
+++ b/runtime/syntax/debcopyright.vim
@@ -0,0 +1,32 @@
+" Vim syntax file
+" Language:Debian copyright file
+" Maintainer:  Chris Lamb 
+" Last Change: 2017 Jul 28
+
+" Standard syntax initialization
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = 
+set cpo
+
+syn case match
+
+syn match debcopyrightUrl   
"\vhttps?://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?$"
+syn match debcopyrightKey   
"^\%(Format\|Upstream-Name\|Upstream-Contact\|Disclaimer\|Source\|Comment\|Files\|Copyright\|License\):
 *"
+syn match debcopyrightEmail "[_=[:alnum:]\.+-]\+@[[:alnum:]\./\-]\+"
+syn match debcopyrightEmail "<.\{-}>"
+syn match debcopyrightComment   "^#.*$" contains=@Spell
+
+hi def link debcopyrightUrl Identifier
+hi def link debcopyrightKey Keyword
+hi def link debcopyrightEmail   Identifier
+hi def link debcopyrightComment Comment
+
+let b:current_syntax = "debcopyright"
+
+let  = s:cpo_save
+unlet s:cpo_save
+
+" vim: ts=8 sw=2