From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 15 Mar 2011 18:37:02 +0000 (-0700)
Subject: * regex.c (re_match_2_internals): Fix one more "not".
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~554^2~65
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8fb3179241c11eef948f612d959521ac31af1560;p=emacs.git

* regex.c (re_match_2_internals): Fix one more "not".
---

diff --git a/src/regex.c b/src/regex.c
index e79316d6bc6..0187a103b32 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -5613,8 +5613,8 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1, int
 	    if (!not) goto fail;
 
 	    d += len;
-	    break;
 	  }
+	  break;
 
 
 	/* The beginning of a group is represented by start_memory.
@@ -6238,8 +6238,8 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1, int
 		goto fail;
 	      d += len;
 	    }
-	    break;
 	  }
+	  break;
 
 #ifdef emacs
 	case before_dot:
@@ -6262,18 +6262,21 @@ re_match_2_internal (struct re_pattern_buffer *bufp, const re_char *string1, int
 
 	case categoryspec:
 	case notcategoryspec:
-	  not = (re_opcode_t) *(p - 1) == notcategoryspec;
-	  mcnt = *p++;
-	  DEBUG_PRINT3 ("EXECUTING %scategoryspec %d.\n", not?"not":"", mcnt);
-	  PREFETCH ();
 	  {
-	    int len;
-	    re_wchar_t c;
+	    boolean not = (re_opcode_t) *(p - 1) == notcategoryspec;
+	    mcnt = *p++;
+	    DEBUG_PRINT3 ("EXECUTING %scategoryspec %d.\n",
+			  not?"not":"", mcnt);
+	    PREFETCH ();
 
-	    GET_CHAR_AFTER (c, d, len);
-	    if ((!CHAR_HAS_CATEGORY (c, mcnt)) ^ not)
-	      goto fail;
-	    d += len;
+	    {
+	      int len;
+	      re_wchar_t c;
+	      GET_CHAR_AFTER (c, d, len);
+	      if ((!CHAR_HAS_CATEGORY (c, mcnt)) ^ not)
+		goto fail;
+	      d += len;
+	    }
 	  }
 	  break;