[vim] 01/01: syntax/debcontrol.vim: Fix highlighting of javascript Section

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit 013d9666be02f584e9d113754af5a61a0b6af4a1
Author: James McCoy <jamessan at debian.org>
Date:   Sun Dec 17 22:20:07 2017 -0500

    syntax/debcontrol.vim: Fix highlighting of javascript Section
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog                                   |  2 ++
 debian/patches/series                              |  1 +
 ...l.vim-Fix-highlighting-of-javascript-Sect.patch | 34 ++++++++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7641a18..d3b19dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ vim (2:8.0.1401-1) UNRELEASED; urgency=medium
     + Fix mechanism used to check for <S-Insert> mappings, since maparg()
       doesn't understand multiple modes in the {mode} argument.  Thanks to
       Sergey Vlasov for the patch!  (Closes: #883422)
+  * syntax/debcontrol.vim:
+    + Fix highlighting of "Section: javascript" … again.  (Closes: #884495)
 
  -- James McCoy <jamessan at debian.org>  Sun, 03 Dec 2017 19:25:24 -0500
 
diff --git a/debian/patches/series b/debian/patches/series
index a145900..a1b6ca3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
 debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
 debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
 upstream/syntax-deb-source-changelog-.vim-Update-release-names.patch
+syntax-debcontrol.vim-Fix-highlighting-of-javascript-Sect.patch
diff --git a/debian/patches/syntax-debcontrol.vim-Fix-highlighting-of-javascript-Sect.patch b/debian/patches/syntax-debcontrol.vim-Fix-highlighting-of-javascript-Sect.patch
new file mode 100644
index 0000000..fc084c8
--- /dev/null
+++ b/debian/patches/syntax-debcontrol.vim-Fix-highlighting-of-javascript-Sect.patch
@@ -0,0 +1,34 @@
+From: James McCoy <jamessan at debian.org>
+Date: Sun, 17 Dec 2017 22:15:58 -0500
+Subject: syntax/debcontrol.vim: Fix highlighting of javascript Section
+
+When converting to the use of lists instead of long regexps, the
+handling of java/javascript was accidentally dropped.
+
+Signed-off-by: James McCoy <jamessan at debian.org>
+---
+ runtime/syntax/debcontrol.vim | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
+index b879074..0f5d8d1 100644
+--- a/runtime/syntax/debcontrol.vim
++++ b/runtime/syntax/debcontrol.vim
+@@ -3,7 +3,7 @@
+ " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
+ " Former Maintainers: Gerfried Fuchs <alfie at ist.org>
+ "                     Wichert Akkerman <wakkerma at debian.org>
+-" Last Change: 2017 Nov 04
++" Last Change: 2017 Dec 17
+ " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debcontrol.vim
+ 
+ " Standard syntax initialization
+@@ -52,7 +52,7 @@ let s:sections = [
+       \, 'devel', 'doc', 'editors', 'education', 'electronics', 'embedded'
+       \, 'fonts', 'games', 'gnome', 'gnustep', 'gnu-r', 'golang', 'graphics'
+       \, 'hamradio', 'haskell', 'httpd', 'interpreters', 'introspection'
+-      \, 'java', 'javascript', 'kde', 'kernel', 'libs', 'libdevel', 'lisp'
++      \, 'java\%(script\)\=', 'kde', 'kernel', 'libs', 'libdevel', 'lisp'
+       \, 'localization', 'mail', 'math', 'metapackages', 'misc', 'net'
+       \, 'news', 'ocaml', 'oldlibs', 'otherosfs', 'perl', 'php', 'python'
+       \, 'ruby', 'rust', 'science', 'shells', 'sound', 'text', 'tex'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git