summaryrefslogtreecommitdiff
path: root/lisp/progmodes/cc-mode.el
diff options
context:
space:
mode:
authorAlan Mackenzie <acm@muc.de>2010-04-12 14:59:56 +0000
committerAlan Mackenzie <acm@muc.de>2010-04-12 14:59:56 +0000
commite2387bdba28af0022a4d63d024a8f16546001612 (patch)
treeebce3210b9d9f2c98ef50474f40dc4a0805c78ea /lisp/progmodes/cc-mode.el
parenta1c7301e3195f11f5544288228d53e82f4caeda8 (diff)
downloademacs-e2387bdba28af0022a4d63d024a8f16546001612.tar.gz
Reverse 2010-02-25T21:21:25Z!acm@muc.de:
" (i) Remove any hard syntax-table properties for <, > inserted by C-y. (ii) Remove category text props, not syntax-table ones in unmarking <, >. ".
Diffstat (limited to 'lisp/progmodes/cc-mode.el')
-rw-r--r--lisp/progmodes/cc-mode.el16
1 files changed, 5 insertions, 11 deletions
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 7f9ed6436f4..57f87c04b88 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -642,9 +642,11 @@ compatible with old code; callers should always specify it."
(widen)
(save-excursion
(if c-get-state-before-change-functions
- (mapc (lambda (fn)
- (funcall fn (point-min) (point-max)))
- c-get-state-before-change-functions))
+ (let ((beg (point-min))
+ (end (point-max)))
+ (mapc (lambda (fn)
+ (funcall fn beg end))
+ c-get-state-before-change-functions)))
(if c-before-font-lock-function
(funcall c-before-font-lock-function (point-min) (point-max)
(- (point-max) (point-min))))))
@@ -1040,14 +1042,6 @@ Note that the style variables are always made local to the buffer."
(when (> beg end)
(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-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-trim-found-types beg end old-len) ; maybe we don't need all of these.
(c-invalidate-sws-region-after beg end)
(c-invalidate-state-cache beg)