r1122 - in /trunk/packages/vim: debian/changelog runtime/syntax/debcontrol.vim

[jamessan at users.alioth.debian.org]

Author: jamessan
Date: Mon Dec 10 17:01:08 2007
New Revision: 1122

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1122
Log:
* runtime/syntax/debcontrol.vim:
  - Reworked the URL regex so that it should properly match any non-local
    domain name as specified in RFC 1738.

Modified:
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/runtime/syntax/debcontrol.vim

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1122&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Mon Dec 10 17:01:08 2007
@@ -1,3 +1,11 @@
+vim (1:7.1-175+2) UNRELEASED; urgency=low
+
+  * runtime/syntax/debcontrol.vim:
+    - Reworked the URL regex so that it should properly match any non-local
+      domain name as specified in RFC 1738.
+
+ -- James Vega <jamessan at debian.org>  Mon, 10 Dec 2007 11:37:09 -0500
+
 vim (1:7.1-175+1) unstable; urgency=low
 
   [ James Vega ]

Modified: trunk/packages/vim/runtime/syntax/debcontrol.vim
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/runtime/syntax/debcontrol.vim?rev=1122&op=diff
==============================================================================
--- trunk/packages/vim/runtime/syntax/debcontrol.vim (original)
+++ trunk/packages/vim/runtime/syntax/debcontrol.vim Mon Dec 10 17:01:08 2007
@@ -32,10 +32,11 @@
 syn match debcontrolPackageType contained "u\?deb"
 syn match debcontrolVariable contained "\${.\{-}}"
 
-" A URL, right now only enforce protocol and some sanity on the server/path
-" part; TODO: debcontrolHTTPUrl somehow is not being matched at all.
-syn match debcontrolUrl contained "\v[+[:alpha:]]+://\a+\.[-_.[:alnum:]]{1,}(:\d+)?(/[^[:space:]]*)?$"
-syn match debcontrolHTTPUrl contained "\vhttps?://\a+\.[-_.[:alnum:]]{1,}(:\d+)?(/[^[:space:]]*)?$"
+" A URL (using the domain name definitions from RFC 1034 and 1738), right now
+" only enforce protocol and some sanity on the server/path part;
+" TODO: debcontrolHTTPUrl somehow is not being matched at all.
+syn match debcontrolUrl contained "\v[+[:alpha:]]+://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-.[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alnum:]]?(:\d+)?(/[^[:space:]]*)?$"
+syn match debcontrolHTTPUrl contained "\vhttps?://[[:alnum:]][-[:alnum:]]*[[:alnum:]]?(\.[[:alnum:]][-[:alnum:]]*[[:alnum:]]?)*\.[[:alpha:]][-[:alnum:]]*[[:alpha:]]?(:\d+)?(/[^[:space:]]*)?$"
 
 " An email address
 syn match	debcontrolEmail	"[_=[:alnum:]\.+-]\+@[[:alnum:]\./\-]\+"