diff options
| author | Kenichi Handa <handa@m17n.org> | 2010-03-02 10:33:48 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2010-03-02 10:33:48 +0900 |
| commit | 743c12d63d0675ecce703c4da9b7f292ac200378 (patch) | |
| tree | 975da4e578962c90258f5710defa508577f8268e | |
| parent | dcfb9bc4a1082ae52ee211dc7050545818c77b38 (diff) | |
| parent | eb2f6eeb39101947ba73dee55e38c2e3b3a07ccf (diff) | |
| download | emacs-743c12d63d0675ecce703c4da9b7f292ac200378.tar.gz | |
from trunk
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1b9871d8291..8f2c2460aad 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 4797cd4a8ca..f4a8c0bf46f 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -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)) |