procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

from trunk

Browse source
This commit is contained in:
Kenichi Handa 2010-03-02 10:33:48 +09:00
commit 743c12d63d
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2010-03-01 Alan Mackenzie <acm@muc.de>
* progmodes/cc-engine.el (c-remove-stale-state-cache): Correct
previous patch.
2010-03-01 Kenichi Handa <handa@m17n.org>
* language/burmese.el (burmese-composable-pattern): Renamed from

5
lisp/progmodes/cc-engine.el
View file

@ -2591,7 +2591,7 @@ comment at the start of cc-engine.el for more info."
(save-restriction
(narrow-to-region 1 (point-max))
(save-excursion
(let* ((in-macro-start ; point-max or beginning of macro containing it
(let* ((in-macro-start ; start of macro containing (point-max) or nil.
(save-excursion
(goto-char (point-max))
(and (c-beginning-of-macro)
@ -2642,7 +2642,8 @@ comment at the start of cc-engine.el for more info."
;; between `good-pos'/`good-pos-actual-macro-start' and (point-max),
;; due to the interface spec to this function.
(setq pos (if (and good-pos-actual-macro-end
(> in-macro-start good-pos-actual-macro-start))
(not (eq good-pos-actual-macro-start
in-macro-start)))
(1+ good-pos-actual-macro-end) ; get outside the macro as
; marked by a `category' text property.
good-pos))