Mercurial > emacs
changeset 107312:3050113d9ebb
from trunk
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Tue, 02 Mar 2010 10:33:48 +0900 |
| parents | cdeadbfdda61 (current diff) 94dd0c99026d (diff) |
| children | 8a921fc271ee 5e25c4602dd4 |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Mar 02 10:30:52 2010 +0900 +++ b/lisp/ChangeLog Tue Mar 02 10:33:48 2010 +0900 @@ -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
--- a/lisp/progmodes/cc-engine.el Tue Mar 02 10:30:52 2010 +0900 +++ b/lisp/progmodes/cc-engine.el Tue Mar 02 10:33:48 2010 +0900 @@ -2591,7 +2591,7 @@ (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 @@ ;; 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))