aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Mackenzie2010-10-19 20:18:35 +0000
committerAlan Mackenzie2010-10-19 20:18:35 +0000
commitba7fdf303b53766521c86dffb2cafb8d80f91bdb (patch)
tree0a34b566441e9c08bb97a8cc102e65c04843ea44
parent917794d547469db5b5229ff508f577b9570804ee (diff)
downloademacs-ba7fdf303b53766521c86dffb2cafb8d80f91bdb.tar.gz
emacs-ba7fdf303b53766521c86dffb2cafb8d80f91bdb.zip
cc-mode.el (c-before-change, c-after-change): Move the setting of
c-new-BEG and c-new-END from c-before-change to c-after-change.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/cc-mode.el8
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 14691b44373..4aa0ead72b4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12010-10-19 Alan Mackenzie <acm@muc.de>
2
3 * progmodes/cc-mode.el (c-before-change, c-after-change): Move the
4 setting of c-new-BEG and c-new-END from c-before-change to
5 c-after-change.
6
12010-10-19 Chong Yidong <cyd@stupidchicken.com> 72010-10-19 Chong Yidong <cyd@stupidchicken.com>
2 8
3 * cus-face.el (custom-theme-set-faces): Revert 2010-10-18 change. 9 * cus-face.el (custom-theme-set-faces): Revert 2010-10-18 change.
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 505a5663ebc..9524ff27d24 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1029,10 +1029,6 @@ Note that the style variables are always made local to the buffer."
1029 (buffer-substring-no-properties type-pos term-pos) 1029 (buffer-substring-no-properties type-pos term-pos)
1030 (buffer-substring-no-properties beg end))))))) 1030 (buffer-substring-no-properties beg end)))))))
1031 1031
1032 ;; (c-new-BEG c-new-END) will be the region to fontify. It may become
1033 ;; larger than (beg end).
1034 (setq c-new-BEG beg
1035 c-new-END end)
1036 (if c-get-state-before-change-functions 1032 (if c-get-state-before-change-functions
1037 (mapc (lambda (fn) 1033 (mapc (lambda (fn)
1038 (funcall fn beg end)) 1034 (funcall fn beg end))
@@ -1086,6 +1082,10 @@ Note that the style variables are always made local to the buffer."
1086 (when c-recognize-<>-arglists 1082 (when c-recognize-<>-arglists
1087 (c-after-change-check-<>-operators beg end)) 1083 (c-after-change-check-<>-operators beg end))
1088 1084
1085 ;; (c-new-BEG c-new-END) will be the region to fontify. It may become
1086 ;; larger than (beg end).
1087 (setq c-new-BEG beg
1088 c-new-END end)
1089 (if c-before-font-lock-function 1089 (if c-before-font-lock-function
1090 (save-excursion 1090 (save-excursion
1091 (funcall c-before-font-lock-function beg end old-len))))))) 1091 (funcall c-before-font-lock-function beg end old-len)))))))