nano

commit 4f3fe133b858a60e40c4964e954fc5c0834ed889
parent f470c900ae2867017f3fdd56671567e08cabc2c7
Author: Chris Allegretta <chrisa@asty.org>
Date:   Thu, 29 May 2014 04:38:16 +0000

2014-05-28  Chris Allegretta <chrisa@asty.org>
        * doc/syntax/mutt.nanorc: Include Benno's awesome signature
          matcher, modified slightly to also work for quoted sigs.
        * doc/syntax/default.nanorc: Be far more gentle with something
          which affects every file which doesn't match another syntax, and
          the user may not be able to override if their distro turns on
          highlighting by default.\



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

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
doc/syntax/default.nanorc
 | 
12
+++---------
M
doc/syntax/mutt.nanorc
 | 
4
++++

3 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2014-05-28  Chris Allegretta <chrisa@asty.org>
+	* doc/syntax/mutt.nanorc: Include Benno's awesome signature
+	  matcher, modified slightly to also work for quoted sigs.
+	* doc/syntax/default.nanorc: Be far more gentle with something
+	  which affects every file which doesn't match another syntax, and
+	  the user may not be able to override if their distro turns on
+	  highlighting by default.
+
 2014-05-28  Benno Schulenberg  <bensberg@justemail.net>
 	* src/nano.c (do_input): Remove the three unused parameters 's_or_t',
 	'ran_func', and 'finished'.  They are only ever set and never used.
diff --git a/doc/syntax/default.nanorc b/doc/syntax/default.nanorc
@@ -1,4 +1,4 @@
-## An example of a default syntax, which is used
+## A default syntax, which is used
 ## for files that do not match any other syntax.
 
 syntax "default"
@@ -9,11 +9,5 @@ color ,red " +	+"
 # Trailing blanks.
 color ,red "[[:blank:]]+$"
 
-# E-mail signatures.
-color yellow start="^-- $" end="^$"
-
-# Nano's name.
-color brightred "(GNU )?nano( [1-9]\.[0-9]\.[^ ]+)?"
-
-# Tease.
-color green "\<yellow\>"
+# Nano's name, including version.
+color brightred "(GNU )?nano [1-9]\.[0-9]\.[^[:space:][:punct:]]+"
diff --git a/doc/syntax/mutt.nanorc b/doc/syntax/mutt.nanorc
@@ -2,4 +2,8 @@
 
 syntax "mutt"
 
+# Quoted lines.
 color green "^>.*"
+
+# Signatures, even quoted ones.
+color yellow start="^>* ?-- $" end="^>* ?$"