[vim] 02/04: debcontrol.vim: Add sections for Rust and JavaScript
James McCoy
jamessan at debian.org
Thu Dec 15 03:12:34 UTC 2016
This is an automated email from the git hooks/post-receive script.
jamessan pushed a commit to branch debian/sid
in repository vim.
commit cc1c19c420336e0f6dfd9f405c071d750ff58580
Author: James McCoy <jamessan at debian.org>
Date: Wed Dec 14 21:47:40 2016 -0500
debcontrol.vim: Add sections for Rust and JavaScript
Signed-off-by: James McCoy <jamessan at debian.org>
---
debian/changelog | 2 ++
...of-more-LaTeX-commands-for-tex-filetype-d.patch | 2 +-
...t-filetype-using-the-contents-of-the-file.patch | 2 +-
...s-decision-to-disable-modelines-by-defaul.patch | 2 +-
...ng-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch | 6 +++---
debian/patches/series | 1 +
...pus-to-deb-changelog-sources-syntax-files.patch | 4 ++--
...ing-compilation-date-in-SOURCE_DATE_EPOCH.patch | 6 +++---
....vim-Add-sections-for-Rust-and-JavaScript.patch | 22 ++++++++++++++++++++++
9 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 984ac8a..e2a7650 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ vim (2:8.0.0095-2) UNRELEASED; urgency=medium
#846183)
* debian/rules: Remove '=' from "define" directive to maintain compatibility
with make < 3.82. (Closes: #846312)
+ * syntax/debcontrol.vim: Add sections for Rust and JavaScript. Thanks to
+ Josh Triplett for the patch! (Closes: #847539)
-- James McCoy <jamessan at debian.org> Tue, 29 Nov 2016 23:06:47 -0500
diff --git a/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch b/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
index 356dafc..e6f1ab5 100644
--- a/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
+++ b/debian/patches/debian/Add-recognition-of-more-LaTeX-commands-for-tex-filetype-d.patch
@@ -13,7 +13,7 @@ Signed-off-by: James McCoy <jamessan at debian.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
-index df8f7fd..17db842 100644
+index df8f7fdd9..17db84276 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -2224,7 +2224,7 @@ func! s:FTtex()
diff --git a/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch b/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
index db591e4..dca240d 100644
--- a/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
+++ b/debian/patches/debian/Detect-the-rst-filetype-using-the-contents-of-the-file.patch
@@ -8,7 +8,7 @@ Closes: #382541
1 file changed, 8 insertions(+)
diff --git a/runtime/scripts.vim b/runtime/scripts.vim
-index 2763828..d3101c6 100644
+index 276382808..d3101c6b7 100644
--- a/runtime/scripts.vim
+++ b/runtime/scripts.vim
@@ -332,6 +332,14 @@ else
diff --git a/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch b/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
index a3d8ade..f669656 100644
--- a/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
+++ b/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
@@ -15,7 +15,7 @@ Signed-off-by: James McCoy <jamessan at debian.org>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
-index 390fab0..73c0680 100644
+index 390fab01d..73c068050 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5122,7 +5122,7 @@ A jump table for the options with a short description can be found at |Q_op|.
diff --git a/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch b/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
index 6654548..52635ee 100644
--- a/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
+++ b/debian/patches/debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
@@ -17,7 +17,7 @@ Signed-off-by: James Vega <jamessan at debian.org>
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/main.c b/src/main.c
-index acc51f1..3c47df2 100644
+index acc51f182..3c47df2eb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1729,6 +1729,10 @@ parse_command_name(mparm_T *parmp)
@@ -56,7 +56,7 @@ index acc51f1..3c47df2 100644
{
/* When no .vimrc file was found: source defaults.vim. */
diff --git a/src/os_unix.h b/src/os_unix.h
-index d28aa4d..3a00e05 100644
+index d28aa4dde..3a00e05df 100644
--- a/src/os_unix.h
+++ b/src/os_unix.h
@@ -213,6 +213,9 @@ typedef struct dsc$descriptor DESC;
@@ -70,7 +70,7 @@ index d28aa4d..3a00e05 100644
# define SYS_VIMRC_FILE "$VIM/vimrc"
#endif
diff --git a/src/structs.h b/src/structs.h
-index c749a36..ce8632d 100644
+index c749a3691..ce8632dde 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -3257,6 +3257,9 @@ typedef struct
diff --git a/debian/patches/series b/debian/patches/series
index 4eab357..f46b624 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/Add-Zesty-Zapus-to-deb-changelog-sources-syntax-files.patch
+upstream/debcontrol.vim-Add-sections-for-Rust-and-JavaScript.patch
diff --git a/debian/patches/upstream/Add-Zesty-Zapus-to-deb-changelog-sources-syntax-files.patch b/debian/patches/upstream/Add-Zesty-Zapus-to-deb-changelog-sources-syntax-files.patch
index 3f2affa..2234e8c 100644
--- a/debian/patches/upstream/Add-Zesty-Zapus-to-deb-changelog-sources-syntax-files.patch
+++ b/debian/patches/upstream/Add-Zesty-Zapus-to-deb-changelog-sources-syntax-files.patch
@@ -8,7 +8,7 @@ Subject: Add Zesty Zapus to deb{changelog,sources} syntax files
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim
-index a10e4ad..eb02aaf 100644
+index a10e4ad34..eb02aaf4a 100644
--- a/runtime/syntax/debchangelog.vim
+++ b/runtime/syntax/debchangelog.vim
@@ -3,7 +3,7 @@
@@ -30,7 +30,7 @@ index a10e4ad..eb02aaf 100644
syn match debchangelogCloses contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*"
syn match debchangelogLP contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*"
diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
-index 2777944..390c430 100644
+index 277794497..390c43035 100644
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -2,7 +2,7 @@
diff --git a/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch b/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch
index 77bc221..16cddcd 100644
--- a/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch
+++ b/debian/patches/upstream/Support-defining-compilation-date-in-SOURCE_DATE_EPOCH.patch
@@ -23,7 +23,7 @@ preprocessor's __DATE__/__TIME__ symbols will be used.
3 files changed, 19 insertions(+)
diff --git a/src/config.h.in b/src/config.h.in
-index 5baac7d..59b6c0b 100644
+index 5baac7d6b..59b6c0b57 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -30,6 +30,9 @@
@@ -37,7 +37,7 @@ index 5baac7d..59b6c0b 100644
#undef HAVE_ATTRIBUTE_UNUSED
diff --git a/src/configure.ac b/src/configure.ac
-index f6a4469..17a4a48 100644
+index f6a44691f..17a4a48f6 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -29,6 +29,16 @@ dnl in autoconf needs it, where it uses STDC_HEADERS.
@@ -58,7 +58,7 @@ index f6a4469..17a4a48 100644
AC_MSG_CHECKING(--enable-fail-if-missing argument)
diff --git a/src/version.c b/src/version.c
-index 731a685..0253dc4 100644
+index 731a6850d..0253dc461 100644
--- a/src/version.c
+++ b/src/version.c
@@ -44,11 +44,17 @@ make_version(void)
diff --git a/debian/patches/upstream/debcontrol.vim-Add-sections-for-Rust-and-JavaScript.patch b/debian/patches/upstream/debcontrol.vim-Add-sections-for-Rust-and-JavaScript.patch
new file mode 100644
index 0000000..86ccc56
--- /dev/null
+++ b/debian/patches/upstream/debcontrol.vim-Add-sections-for-Rust-and-JavaScript.patch
@@ -0,0 +1,22 @@
+From: Josh Triplett <josh at joshtriplett.org>
+Date: Thu, 8 Dec 2016 20:12:55 -0800
+Subject: debcontrol.vim: Add sections for Rust and JavaScript
+
+Signed-off-by: James McCoy <jamessan at debian.org>
+---
+ runtime/syntax/debcontrol.vim | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
+index b52c496c9..b1bc9f8bf 100644
+--- a/runtime/syntax/debcontrol.vim
++++ b/runtime/syntax/debcontrol.vim
+@@ -38,7 +38,7 @@ unlet s:kernels s:archs s:pairs
+ syn match debcontrolMultiArch contained "\%(no\|foreign\|allowed\|same\)"
+ syn match debcontrolName contained "[a-z0-9][a-z0-9+.-]\+"
+ syn match debcontrolPriority contained "\(extra\|important\|optional\|required\|standard\)"
+-syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/contrib|non-US/non-free|restricted|universe|multiverse)/)?(admin|cli-mono|comm|database|debian-installer|debug|devel|doc|editors|education|electronics|embedded|fonts|games|gnome|gnustep|gnu-r|graphics|hamradio|haskell|httpd|interpreters|introspection|java|kde|kernel|libs|libdevel|lisp|localization|mail|math|metapackages|misc|net|news|ocaml|oldlibs|otherosfs|perl|php|python|ruby|science|shells|sound|text|tex|u [...]
++syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/contrib|non-US/non-free|restricted|universe|multiverse)/)?(admin|cli-mono|comm|database|debian-installer|debug|devel|doc|editors|education|electronics|embedded|fonts|games|gnome|gnustep|gnu-r|graphics|hamradio|haskell|httpd|interpreters|introspection|java|javascript|kde|kernel|libs|libdevel|lisp|localization|mail|math|metapackages|misc|net|news|ocaml|oldlibs|otherosfs|perl|php|python|ruby|rust|science|shells| [...]
+ syn match debcontrolPackageType contained "u\?deb"
+ syn match debcontrolVariable contained "\${.\{-}}"
+ syn match debcontrolDmUpload contained "\cyes"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git
More information about the pkg-vim-maintainers
mailing list