Remove spurious syntax-table text properties inserted by C-y.

        * progmodes/cc-mode.el (c-after-change): Also clear hard
        syntax-table property with value nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 05360ad..8f070f1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-27  Alan Mackenzie  <acm@muc.de>
+
+       Remove spurious syntax-table text properties inserted by C-y.
+       * progmodes/cc-mode.el (c-after-change): Also clear hard
+       syntax-table property with value nil.
+
 2013-05-27  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/dbus.el (dbus-call-method): Let-bind `inhibit-redisplay'

diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index d7416ae..345bbb7 100644 (file)
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1077,12 +1077,13 @@ Note that the style variables are always made local to the buffer."
            (setq beg end)))
 
        ;; C-y is capable of spuriously converting category properties
-       ;; c-</>-as-paren-syntax into hard syntax-table properties.  Remove
-       ;; these when it happens.
+       ;; c-</>-as-paren-syntax and c-cpp-delimiter into hard syntax-table
+       ;; properties.  Remove these when it happens.
        (c-clear-char-property-with-value beg end 'syntax-table
                                          c-<-as-paren-syntax)
        (c-clear-char-property-with-value beg end 'syntax-table
                                          c->-as-paren-syntax)
+       (c-clear-char-property-with-value beg end 'syntax-table nil)
 
        (c-trim-found-types beg end old-len) ; maybe we don't need all of these.
        (c-invalidate-sws-region-after beg end)