[Emacs-diffs] /srv/bzr/emacs/trunk r112742: Remove spurious syntax-table text properties inserted by C-y.

[Alan Mackenzie]

------------------------------------------------------------
revno: 112742
committer: Alan Mackenzie <address@hidden>
branch nick: trunk
timestamp: Mon 2013-05-27 13:30:21 +0000
message:
          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.
modified:
  lisp/ChangeLog
  lisp/progmodes/cc-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-27 12:41:17 +0000
+++ b/lisp/ChangeLog    2013-05-27 13:30:21 +0000
@@ -1,3 +1,9 @@
+2013-05-27  Alan Mackenzie  <address@hidden>
+
+       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  <address@hidden>
 
        * net/dbus.el (dbus-call-method): Let-bind `inhibit-redisplay'

=== modified file 'lisp/progmodes/cc-mode.el'
--- a/lisp/progmodes/cc-mode.el 2013-05-02 11:18:18 +0000
+++ b/lisp/progmodes/cc-mode.el 2013-05-27 13:30:21 +0000
@@ -1077,12 +1077,13 @@
            (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)