Allow " symbol to be in regex without leading by checking for *ptr+1 is not the end...

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

diff --git a/ChangeLog b/ChangeLog
index b5837b937b9717696045c3abd06e9a58d7ff44f3..ef05e44b231d9e996ef1bcd11ad081feb41fccf4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ CVS code -
          -C, --relative, changes to do_cursorpos().
 - Makefile.am:
        - Add SYSCONFDIR to DEFS, so we can have an /etc/nanorc.
+- rcfile.c
+  parse_next_rege()
+       - Allow " symbol to be in regex without leading \ by checking
+         for *ptr+1 is not the end of the regex.
 - utils.c:
   strstrwrapper()
        - NANO_SMALL test was backwards (Ken Tyler).

diff --git a/rcfile.c b/rcfile.c
index 491cb3081bb8c0ac37d5eca9b200ab0d6ad6bf2f..45fca83b22d877cf86fa6f10ad0e9ae68ba3013b 100644 (file)
--- a/rcfile.c
+++ b/rcfile.c
@@ -131,11 +131,9 @@ char *parse_next_word(char *ptr)
 
 char *parse_next_regex(char *ptr)
 {
-    char prev = ' ';
-    while ((*ptr != '"' || prev == '\\') && *ptr != '\n' && *ptr != '\0') {
-       prev = *ptr;
+    while ((*ptr != '"' || (*(ptr+1) != ' ' && *(ptr+1) != '\n')) 
+          && *ptr != '\n' && *ptr != '\0')
        ptr++;
-    }
 
     if (*ptr == '\0')
        return NULL;