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

diff --git a/ChangeLog b/ChangeLog
index 2b2372f2d35071bcb55136467231a3d64624f2a9..a48a47303c0ea7b1a2d21454319b11b61ac9faa4 100644 (file)
--- 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
index 9047b9d51f0f699c014a01d1dc5106cb36552800..8d8e0397c26b67a92e02f0e7002eb1fc48b43195 100644 (file)
--- 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
index 9acd6a09515f4ef4e2543ac91f94bdf1c2a8682d..80fbcf46ef332d568ca4772f5763c7797e1f8df7 100644 (file)
--- 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="^>* ?$"