(c-after-change-check-<>-operators):

After-change-functions should not clobber the match data.

1 files changed, 23 insertions, 22 deletions

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index c9f2b87b7f1..7f829bd26d5 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -3993,35 +3993,36 @@ comment at the start of cc-engine.el for more info."
   ;;
   ;; This function might do hidden buffer changes.
 
-  (save-excursion
-    (goto-char beg)
-    (when (or (looking-at "[<>]")
-              (< (skip-chars-backward "<>") 0))
-
+  (save-match-data
+    (save-excursion
       (goto-char beg)
-      (c-beginning-of-current-token)
-      (when (and (< (point) beg)
-                 (looking-at c-<>-multichar-token-regexp)
-                 (< beg (setq beg (match-end 0))))
-        (while (progn (skip-chars-forward "^<>" beg)
-                      (< (point) beg))
-          (c-clear-char-property (point) 'syntax-table)
-          (forward-char))))
-
-    (when (< beg end)
-      (goto-char end)
       (when (or (looking-at "[<>]")
                 (< (skip-chars-backward "<>") 0))
 
-        (goto-char end)
+        (goto-char beg)
         (c-beginning-of-current-token)
-        (when (and (< (point) end)
+        (when (and (< (point) beg)
                    (looking-at c-<>-multichar-token-regexp)
-                   (< end (setq end (match-end 0))))
-          (while (progn (skip-chars-forward "^<>" end)
-                        (< (point) end))
+                   (< beg (setq beg (match-end 0))))
+          (while (progn (skip-chars-forward "^<>" beg)
+                        (< (point) beg))
             (c-clear-char-property (point) 'syntax-table)
-            (forward-char)))))))
+            (forward-char))))
+
+      (when (< beg end)
+        (goto-char end)
+        (when (or (looking-at "[<>]")
+                  (< (skip-chars-backward "<>") 0))
+
+          (goto-char end)
+          (c-beginning-of-current-token)
+          (when (and (< (point) end)
+                     (looking-at c-<>-multichar-token-regexp)
+                     (< end (setq end (match-end 0))))
+            (while (progn (skip-chars-forward "^<>" end)
+                          (< (point) end))
+              (c-clear-char-property (point) 'syntax-table)
+              (forward-char))))))))
 
 ;; Dynamically bound variable that instructs `c-forward-type' to also
 ;; treat possible types (i.e. those that it normally returns 'maybe or