Commit 2811df2c authored by Alan Mackenzie's avatar Alan Mackenzie
Browse files

Reverse 2010-03-01T17:46:36Z!acm@muc.de "Correct buggy patch...

Reverse 2010-03-01T17:46:36Z!acm@muc.de "Correct buggy patch 2010-03-01T11:31:42Z!acm@muc.de to cc-engine.el.".
parent db00cb3a
......@@ -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
......
......@@ -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))
......
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