mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

Reverse 2010-03-01T17:46:36Z!acm@muc.de "Correct buggy patch 2010-03-01T11:31:42Z!acm@muc.de to cc-engine.el.".

Browse source
This commit is contained in:
Alan Mackenzie 2010-04-12 14:48:07 +00:00
parent db00cb3ae4
commit 2811df2c90
2 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -282,11 +282,6 @@
* calendar/cal-hebrew.el (holiday-hebrew-passover): Fix date
of Yom HaAtzma'ut when it falls on a Monday (rule changed in 2004).
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): Rename 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 ; start of macro containing (point-max) or nil.
(let* ((in-macro-start ; point-max or beginning of macro containing it
(save-excursion
(goto-char (point-max))
(and (c-beginning-of-macro)
@ -2642,8 +2642,7 @@ 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
(not (eq good-pos-actual-macro-start
in-macro-start)))
(> in-macro-start good-pos-actual-macro-start))
(1+ good-pos-actual-macro-end) ; get outside the macro as
; marked by a `category' text property.
good-pos))