move the nanorc regexes to a separate file too

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

diff --git a/ChangeLog b/ChangeLog
index 5df83e5f9e5d4a3f5a928f416b9aace28eecd3d2..48c6a5065ce0beb8dfb7cdedd7f38abb229d5b56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -129,12 +129,12 @@ CVS code -
          doc/syntax/asm.nanorc, doc/syntax/c.nanorc,
          doc/syntax/groff.nanorc, doc/syntax/html.nanorc,
          doc/syntax/java.nanorc, doc/syntax/man.nanorc,
-         doc/syntax/mutt.nanorc, doc/syntax/patch.nanorc,
-         doc/syntax/perl.nanorc, doc/syntax/python.nanorc,
-         doc/syntax/ruby.nanorc, doc/syntax/sh.nanorc, and
-         doc/syntax/tex.nanorc; changes to configure.ac, nano.spec.in,
-         doc/Makefile.am, and m4/Makefile.am; removal of
-         doc/nanorc.sample. (DLR)
+         doc/syntax/mutt.nanorc, doc/syntax/nanorc.nanorc,
+         doc/syntax/patch.nanorc, doc/syntax/perl.nanorc,
+         doc/syntax/python.nanorc, doc/syntax/ruby.nanorc,
+         doc/syntax/sh.nanorc, and doc/syntax/tex.nanorc; changes to
+         configure.ac, nano.spec.in, doc/Makefile.am, and
+         m4/Makefile.am; removal of doc/nanorc.sample. (DLR)
 - browser.c:
   do_browser()
        - Reference NANO_GOTODIR_(ALT|F)?KEY instead of

diff --git a/doc/nanorc.sample.in b/doc/nanorc.sample.in
index 964a9e5901a9145433154ba6a3874d65c6ac4074..90566929c0aba0b5a8d78089d46328ca256ba8af 100644 (file)
--- a/doc/nanorc.sample.in
+++ b/doc/nanorc.sample.in
@@ -208,21 +208,8 @@
 ##
 ## All regexes should be extended regular expressions.
 
-## Here is an example for your .nanorc.
-##
-# syntax "nanorc" "\.?nanorc$"
-## Possible errors and parameters
-# icolor brightwhite "^[[:space:]]*((un)?set|include|syntax|i?color).*$"
-## Keywords
-# icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|preserve|punct)\>" "^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|speller|suspend|tabsize|tabstospaces|tempfile|view|whitespace|wordbounds)\>"
-# icolor green "^[[:space:]]*(set|unset|include|syntax)\>"
-## Colors
-# icolor yellow "^[[:space:]]*i?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
-# icolor magenta "^[[:space:]]*i?color\>" "\<(start|end)="
-## Strings
-# icolor white ""(\\.|[^"])*""
-## Comments
-# icolor brightblue "^[[:space:]]*#.*$"
+## Nanorc files
+# include "@PKGDATADIR@/nanorc.nanorc"
 
 ## C/C++
 # include "@PKGDATADIR@/c.nanorc"

diff --git a/doc/syntax/Makefile.am b/doc/syntax/Makefile.am
index 82a648bac51a52b325d2342a32e1e72b7b0fce75..96150a305f68d071cd78d955d86f3d901aceac23 100644 (file)
--- a/doc/syntax/Makefile.am
+++ b/doc/syntax/Makefile.am
@@ -5,6 +5,7 @@ pkgdata_DATA =  asm.nanorc \
                java.nanorc \
                man.nanorc \
                mutt.nanorc \
+               nanorc.nanorc \
                patch.nanorc \
                perl.nanorc \
                python.nanorc \

diff --git a/doc/syntax/nanorc.nanorc b/doc/syntax/nanorc.nanorc
new file mode 100644 (file)
index 0000000..c534ad5
--- /dev/null
+++ b/doc/syntax/nanorc.nanorc
@@ -0,0 +1,15 @@
+## Here is an example for nanorc files.
+##
+syntax "nanorc" "\.?nanorc$"
+## Possible errors and parameters
+icolor brightwhite "^[[:space:]]*((un)?set|include|syntax|i?color).*$"
+## Keywords
+icolor brightgreen "^[[:space:]]*(set|unset)[[:space:]]+(autoindent|backup|backupdir|backwards|boldtext|brackets|casesensitive|const|cut|fill|historylog|matchbrackets|morespace|mouse|multibuffer|noconvert|nofollow|nohelp|nonewlines|nowrap|operatingdir|preserve|punct)\>" "^[[:space:]]*(set|unset)[[:space:]]+(quickblank|quotestr|rebinddelete|rebindkeypad|regexp|smarthome|smooth|speller|suspend|tabsize|tabstospaces|tempfile|view|whitespace|wordbounds)\>"
+icolor green "^[[:space:]]*(set|unset|include|syntax)\>"
+## Colors
+icolor yellow "^[[:space:]]*i?color[[:space:]]*(bright)?(white|black|red|blue|green|yellow|magenta|cyan)?(,(white|black|red|blue|green|yellow|magenta|cyan))?\>"
+icolor magenta "^[[:space:]]*i?color\>" "\<(start|end)="
+## Strings
+icolor white ""(\\.|[^"])*""
+## Comments
+icolor brightblue "^[[:space:]]*#.*$"