[vim] 01/01: syntax/debsources: Recognize https URLs

[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 54bdf4eb876511e6b39b16f9ad93345df1c60227
Author: James McCoy <jamessan at debian.org>
Date:   Tue Sep 27 22:03:03 2016 -0400

    syntax/debsources: Recognize https URLs
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog                                   |  7 +++++
 debian/patches/series                              |  1 +
 .../upstream/Added-https-to-debsources.patch       | 31 ++++++++++++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 651da00..b80c7b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vim (2:8.0.0003-2) UNRELEASED; urgency=medium
+
+  * syntax/debsources: Recognize https URLs.  Thanks to Joe Stein for the
+    patch!
+
+ -- James McCoy <jamessan at debian.org>  Tue, 27 Sep 2016 22:02:22 -0400
+
 vim (2:8.0.0003-1) unstable; urgency=medium
 
   [ upstream ]
diff --git a/debian/patches/series b/debian/patches/series
index 600d04b..c01f1b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ debian/Support-sourcing-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch
 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/Added-https-to-debsources.patch
diff --git a/debian/patches/upstream/Added-https-to-debsources.patch b/debian/patches/upstream/Added-https-to-debsources.patch
new file mode 100644
index 0000000..ee4fce0
--- /dev/null
+++ b/debian/patches/upstream/Added-https-to-debsources.patch
@@ -0,0 +1,31 @@
+From: Joe Stein <joeaarons at gmail.com>
+Date: Tue, 27 Sep 2016 15:51:58 -0400
+Subject: Added https to debsources
+
+Signed-off-by: James McCoy <jamessan at debian.org>
+---
+ runtime/syntax/debsources.vim | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
+index 232e727..2777944 100644
+--- a/runtime/syntax/debsources.vim
++++ b/runtime/syntax/debsources.vim
+@@ -2,7 +2,7 @@
+ " Language:     Debian sources.list
+ " Maintainer:   Debian Vim Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
+ " Former Maintainer: Matthijs Mohlmann <matthijs at cacholong.nl>
+-" Last Change: 2016 Aug 30
++" Last Change: 2016 Sep 27
+ " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debsources.vim
+ 
+ " Standard syntax initialization
+@@ -39,7 +39,7 @@ let s:unsupported = [
+ let &cpo=s:cpo
+ 
+ " Match uri's
+-syn match debsourcesUri            +\(http://\|ftp://\|[rs]sh://\|debtorrent://\|\(cdrom\|copy\|file\):\)[^' 	<>"]\++
++syn match debsourcesUri            +\(https\?://\|ftp://\|[rs]sh://\|debtorrent://\|\(cdrom\|copy\|file\):\)[^' 	<>"]\++
+ exe 'syn match debsourcesDistrKeyword   +\([[:alnum:]_./]*\)\('. join(s:supported, '\|'). '\)\([-[:alnum:]_./]*\)+'
+ exe 'syn match debsourcesUnsupportedDistrKeyword +\([[:alnum:]_./]*\)\('. join(s:unsupported, '\|') .'\)\([-[:alnum:]_./]*\)+'
+ 

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