Commit e2387bdb authored by Alan Mackenzie's avatar Alan Mackenzie
Browse files

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 <, >.
".
parent a1c7301e
...@@ -358,16 +358,6 @@ ...@@ -358,16 +358,6 @@
* mail/sendmail.el (send-mail-function): Autoload the call * mail/sendmail.el (send-mail-function): Autoload the call
to custom-initialize-delay, not otherwise preserved in loaddefs.el. to custom-initialize-delay, not otherwise preserved in loaddefs.el.
2010-02-25 Alan Mackenzie <acm@muc.de>
* progmodes/cc-engine.el (c-clear-<-pair-props)
(c-clear->-pair-props): Correct to wipe category text props, not
syntax-table ones.
* progmodes/cc-mode.el (c-after-change): Remove any hard
syntax-table properties for <, > which, e.g., C-y has
inopportunely converted from category properties.
2010-02-24 Chong Yidong <cyd@stupidchicken.com> 2010-02-24 Chong Yidong <cyd@stupidchicken.com>
* files.el (hack-local-variables-filter): For eval forms, also * files.el (hack-local-variables-filter): For eval forms, also
......
...@@ -4929,8 +4929,8 @@ comment at the start of cc-engine.el for more info." ...@@ -4929,8 +4929,8 @@ comment at the start of cc-engine.el for more info."
(c-go-list-forward)) (c-go-list-forward))
(when (equal (c-get-char-property (1- (point)) 'syntax-table) (when (equal (c-get-char-property (1- (point)) 'syntax-table)
c->-as-paren-syntax) ; should always be true. c->-as-paren-syntax) ; should always be true.
(c-clear-char-property (1- (point)) 'category)) (c-clear-char-property (1- (point)) 'syntax-table))
(c-clear-char-property pos 'category)))) (c-clear-char-property pos 'syntax-table))))
(defun c-clear->-pair-props (&optional pos) (defun c-clear->-pair-props (&optional pos)
;; POS (default point) is at a > character. If it is marked with ;; POS (default point) is at a > character. If it is marked with
...@@ -4946,8 +4946,8 @@ comment at the start of cc-engine.el for more info." ...@@ -4946,8 +4946,8 @@ comment at the start of cc-engine.el for more info."
(c-go-up-list-backward)) (c-go-up-list-backward))
(when (equal (c-get-char-property (point) 'syntax-table) (when (equal (c-get-char-property (point) 'syntax-table)
c-<-as-paren-syntax) ; should always be true. c-<-as-paren-syntax) ; should always be true.
(c-clear-char-property (point) 'category)) (c-clear-char-property (point) 'syntax-table))
(c-clear-char-property pos 'category)))) (c-clear-char-property pos 'syntax-table))))
(defun c-clear-<>-pair-props (&optional pos) (defun c-clear-<>-pair-props (&optional pos)
;; POS (default point) is at a < or > character. If it has an ;; POS (default point) is at a < or > character. If it has an
......
...@@ -642,9 +642,11 @@ compatible with old code; callers should always specify it." ...@@ -642,9 +642,11 @@ compatible with old code; callers should always specify it."
(widen) (widen)
(save-excursion (save-excursion
(if c-get-state-before-change-functions (if c-get-state-before-change-functions
(mapc (lambda (fn) (let ((beg (point-min))
(funcall fn (point-min) (point-max))) (end (point-max)))
c-get-state-before-change-functions)) (mapc (lambda (fn)
(funcall fn beg end))
c-get-state-before-change-functions)))
(if c-before-font-lock-function (if c-before-font-lock-function
(funcall c-before-font-lock-function (point-min) (point-max) (funcall c-before-font-lock-function (point-min) (point-max)
(- (point-max) (point-min)))))) (- (point-max) (point-min))))))
...@@ -1040,14 +1042,6 @@ Note that the style variables are always made local to the buffer." ...@@ -1040,14 +1042,6 @@ Note that the style variables are always made local to the buffer."
(when (> beg end) (when (> beg end)
(setq 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-trim-found-types beg end old-len) ; maybe we don't need all of these.
(c-invalidate-sws-region-after beg end) (c-invalidate-sws-region-after beg end)
(c-invalidate-state-cache beg) (c-invalidate-state-cache beg)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment