Mercurial > emacs
changeset 107936:10f6e25f2e26
Reverse 99556:
" (i) Remove any hard syntax-table properties for <, > inserted by C-y.
(ii) Remove category text props, not syntax-table ones in unmarking <, >.
".
| author | Alan Mackenzie <acm@muc.de> |
|---|---|
| date | Mon, 12 Apr 2010 14:59:56 +0000 |
| parents | a228af19ba66 |
| children | 18526db8f26d |
| files | lisp/ChangeLog lisp/progmodes/cc-engine.el lisp/progmodes/cc-mode.el |
| diffstat | 3 files changed, 9 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Apr 12 14:55:18 2010 +0000 +++ b/lisp/ChangeLog Mon Apr 12 14:59:56 2010 +0000 @@ -358,16 +358,6 @@ * mail/sendmail.el (send-mail-function): Autoload the call 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> * files.el (hack-local-variables-filter): For eval forms, also
--- a/lisp/progmodes/cc-engine.el Mon Apr 12 14:55:18 2010 +0000 +++ b/lisp/progmodes/cc-engine.el Mon Apr 12 14:59:56 2010 +0000 @@ -4929,8 +4929,8 @@ (c-go-list-forward)) (when (equal (c-get-char-property (1- (point)) 'syntax-table) c->-as-paren-syntax) ; should always be true. - (c-clear-char-property (1- (point)) 'category)) - (c-clear-char-property pos 'category)))) + (c-clear-char-property (1- (point)) 'syntax-table)) + (c-clear-char-property pos 'syntax-table)))) (defun c-clear->-pair-props (&optional pos) ;; POS (default point) is at a > character. If it is marked with @@ -4946,8 +4946,8 @@ (c-go-up-list-backward)) (when (equal (c-get-char-property (point) 'syntax-table) c-<-as-paren-syntax) ; should always be true. - (c-clear-char-property (point) 'category)) - (c-clear-char-property pos 'category)))) + (c-clear-char-property (point) 'syntax-table)) + (c-clear-char-property pos 'syntax-table)))) (defun c-clear-<>-pair-props (&optional pos) ;; POS (default point) is at a < or > character. If it has an
--- a/lisp/progmodes/cc-mode.el Mon Apr 12 14:55:18 2010 +0000 +++ b/lisp/progmodes/cc-mode.el Mon Apr 12 14:59:56 2010 +0000 @@ -642,9 +642,11 @@ (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 @@ (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)