From: Chris Allegretta Date: Thu, 20 Mar 2008 05:41:00 +0000 (+0000) Subject: Add some rc file name debugging X-Git-Tag: v2.1.1~5 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=cc60c3a767829a8430a32d7454ba3ba3f65cb25d;p=nano.git 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 8f7877f5..f70103f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 2008-03-19 Chris Allegretta * gloabl.c: Fix bracket matching sequence to be M-] not M-[, as reported Nick Warne . + * 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 2008-03-18 Mike Frysinger * winio.c: Remove unneeded variable in parse_kbinput() diff --git a/doc/syntax/Makefile.am b/doc/syntax/Makefile.am index bd62eed3..49119710 100644 --- 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 index 00000000..14059b88 --- /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 5714d063..9c65d7a1 100644 --- 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)