From: Benno Schulenberg <bensberg@justemail.net>
Date: Fri, 16 May 2014 20:13:02 +0000 (+0000)
Subject: Making the component colouring simpler, and the URI colouring completer,
X-Git-Tag: v2.3.3~32
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=1028d65aa9e737cbf8a1491da6c12dc577f02934;p=nano.git

Making the component colouring simpler, and the URI colouring completer,
and improving the comments -- all for apt's sources list.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4898 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/ChangeLog b/ChangeLog
index 757ce575..3304a28a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2014-05-16  Benno Schulenberg  <bensberg@justemail.net>
 	* src/text.c, src/winio.c: Remove some more double spaces.
 	* doc/syntax/patch.nanorc: Show trailing whitespace on added lines.
+	* doc/syntax/debian.nanorc: Make the component colouring simpler,
+	and the URI colouring completer, and improve the comments.
 
 2014-05-16  David Lawrence Ramsey  <pooka109@gmail.com>
 	* src/color.c, src/cut.c, src/text.c: Tweak some whitespace.
diff --git a/doc/syntax/debian.nanorc b/doc/syntax/debian.nanorc
index 0803fd0d..1083abe7 100644
--- a/doc/syntax/debian.nanorc
+++ b/doc/syntax/debian.nanorc
@@ -1,19 +1,19 @@
-## Here is an exmaple for apt's sources.list.
-## (adapted from http://milianw.de/blog/Syntax-Highlighting-in-Nano)
-##
+## Here is an example for apt's sources.list.
+
 syntax "apt/sources.list" "sources\.list(\.old|~)?$"
-# component
-color brightmagenta "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/) [^ ]+ .+$"
-# distribution
-color brightred "^deb(-src)? ((http|file|ftp):/[^ ]+|cdrom:\[[^\]]+\]/|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/) [^ ]+"
-# URI
-color brightgreen "(http|file|ftp):/[^ ]+"
-# cdroms
-# [^\]] does not work...
+
+# Coloring the deb lines, working from tail to head.  First the
+# components -- well, everything, and thus also the components.
+color brightmagenta "^deb.*"
+# Distribution -- well, everything, except the components.
+color brightred "^deb(-src)? ((http|ftp|rsh|ssh|file|copy):/[^ ]+|cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/) [^ ]+"
+# URIs.
+color brightgreen "(http|ftp|rsh|ssh|file|copy):/[^ ]+"
+# CDroms.
 color brightgreen "cdrom:\[[-a-zA-Z0-9\._\(\) ]+\]/"
-# deb / deb-src
-color yellow "^deb"
-color yellow "^deb-src"
-# comments
+# And finally the initial deb tag.
+color yellow "^deb(-src)?"
+
+# Comments.
 color brightblue "#.*"