Disabling the regex for multiline strings in C and Assembler,

as it colours some things wrong and is a glutton on time.

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

diff --git a/ChangeLog b/ChangeLog
index 673e16155aba0dbe2b7da6af717833c1d5231126..89ff5007f43771606d6e5348ac9b6c45234981f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-29  Benno Schulenberg  <bensberg@justemail.net>
+       * doc/syntax/{c,objc,asm}.nanorc: Disable the regex for multiline
+       strings as it colours some things wrong and is a glutton on time.
+
 2015-12-23  Benno Schulenberg  <bensberg@justemail.net>
        * src/files.c (do_writeout, do_writeout_void), src/global.c
        (shortcut_init, strtosc), src/nano.c (do_exit, close_and_go),

diff --git a/doc/syntax/asm.nanorc b/doc/syntax/asm.nanorc
index 4e2159155a941c94155bb3d39a157ccb5d765e80..f1719a4a5ce37aa020b478d3635a0563b340ced8 100644 (file)
--- a/doc/syntax/asm.nanorc
+++ b/doc/syntax/asm.nanorc
@@ -12,8 +12,9 @@ color brightcyan "^[[:space:]]*#[[:space:]]*(define|undef|include|ifn?def|endif|
 
 # Strings.
 color brightyellow "<[^=       ]*>" ""(\\.|[^"])*""
-# Multiline strings (note: VERY resource intensive).
-color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+# Multiline strings.  This regex is VERY resource intensive,
+# and sometimes colours things that shouldn't be coloured.
+###color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
 
 # Comments.
 color brightblue "//.*"

diff --git a/doc/syntax/c.nanorc b/doc/syntax/c.nanorc
index 8fe7088dcfc38353dc0b06b3e124c31af34be206..7aa9e017f7d0b3b9f88ca1b8ae36995c673b10cb 100644 (file)
--- a/doc/syntax/c.nanorc
+++ b/doc/syntax/c.nanorc
@@ -19,8 +19,9 @@ color cyan "__attribute__[[:space:]]*\(\([^)]*\)\)" "__(aligned|asm|builtin|hidd
 # Strings.  In general you will want your strings and comments to come last,
 # because highlighting rules are applied in the order they are read in.
 color brightyellow "<[^=       ]*>" ""(\\.|[^"])*""
-# Multiline strings.  This regex is VERY resource intensive!
-color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+# Multiline strings.  This regex is VERY resource intensive,
+# and sometimes colours things that shouldn't be coloured.
+###color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
 
 # Comments.
 color brightblue "//.*"

diff --git a/doc/syntax/objc.nanorc b/doc/syntax/objc.nanorc
index bfbae1260a9e1e9a9a18c92d6485c09569cb63cc..a2a11d6305d2ebbfc05adcac38a1ee6f32024f9a 100644 (file)
--- a/doc/syntax/objc.nanorc
+++ b/doc/syntax/objc.nanorc
@@ -25,8 +25,9 @@ color white "\[[^][:space:]]*\]"
 color brightblack "'([^'\]|(\\["'abfnrtv\\]))'" "'\\(([0-3]?[0-7]{1,2}))'" "'\\x[0-9A-Fa-f]{1,2}'"
 color brightblack "<[^=        ]*>" ""(\\.|[^"])*""
 color brightblue "@"(\\.|[^"])*""
-# Multiline strings.  This regex is VERY resource intensive!
-## color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
+# Multiline strings.  This regex is VERY resource intensive,
+# and sometimes colours things that shouldn't be coloured.
+###color brightyellow start=""(\\.|[^"])*\\[[:space:]]*$" end="^(\\.|[^"])*""
 
 # Preprocessor commands.
 color brightblue "^[[:space:]]*#[[:space:]]*(define|include|import|(un|ifn?)def|endif|el(if|se)|if|warning|error)"