Add some rc file name debugging

Add debian nanorc example
Fix that previous entries as well as new one need Makefile.am entries

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

diff --git a/ChangeLog b/ChangeLog
index 8f7877f5f0d5bb832e1bddedae57ce40006cd6a1..f70103f1dceddd240322fd571a814e5b4da54586 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2008-03-19  Chris Allegretta <chrisa@asty.org>
        * gloabl.c: Fix bracket matching sequence to be M-] not M-[, as reported
          Nick Warne <nick@ukfsn.org>.
+       * doc/syntax/Makefile.am - Actually include new syntaxes from Mike, etc
+       * debian.nanorc - New debian sources.list config since we're including
+         gentoo, adapted from Milian Wolff <mail@milianw.de>
 
 2008-03-18  Mike Frysinger <vapier@gentoo.org>
        * winio.c: Remove unneeded variable in parse_kbinput()

diff --git a/doc/syntax/Makefile.am b/doc/syntax/Makefile.am
index bd62eed32349af6752e2af33cb577d20168d1b47..4911971026f9138b14f0fc1bcc08a38465572da3 100644 (file)
--- a/doc/syntax/Makefile.am
+++ b/doc/syntax/Makefile.am
@@ -12,6 +12,10 @@ pkgdata_DATA =       asm.nanorc \
                python.nanorc \
                ruby.nanorc \
                sh.nanorc \
-               tex.nanorc
+               tex.nanorc \
+               tcl.nanorc \
+               php.nanorc \
+               gentoo.nanorc \
+               debian.nanorc
 
 EXTRA_DIST = $(pkgdata_DATA)

diff --git a/doc/syntax/debian.nanorc b/doc/syntax/debian.nanorc
new file mode 100644 (file)
index 0000000..14059b8
--- /dev/null
+++ b/doc/syntax/debian.nanorc
@@ -0,0 +1,20 @@
+## Here is an exmaple for apt's sources.list
+## Adapted from http://milianw.de/blog/Syntax-Highlighting-in-Nano
+## (mail@milianw.de).
+##
+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...
+color brightgreen "cdrom:\[[a-zA-Z0-9\._-\(\) ]+\]/"
+# deb / deb-src
+color yellow "^deb"
+color yellow "^deb-src"
+# comments
+color brightblue "#.*"
+

diff --git a/src/rcfile.c b/src/rcfile.c
index 5714d063c1a1339ce25621db6f112c1c6499ba5e..9c65d7a1b344175981d406c91862ca78331af81d 100644 (file)
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -478,6 +478,10 @@ void parse_include(char *ptr)
     nanorc = full_option;
     lineno = 0;
 
+#ifdef DEBUG
+    fprintf(stderr, "Parsing file \"%s\"\n", full_option);
+#endif
+
     parse_rcfile(rcstream
 #ifdef ENABLE_COLOR
        , TRUE
@@ -991,6 +995,10 @@ void do_rcfile(void)
                _("\"%s\" is a device file"), nanorc);
     }
 
+#ifdef DEBUG
+    fprintf(stderr, "Parsing file \"%s\"\n", nanorc);
+#endif
+
     /* Try to open the system-wide nanorc. */
     rcstream = fopen(nanorc, "rb");
     if (rcstream != NULL)