diff options
| author | Alan Mackenzie <acm@muc.de> | 2010-04-12 14:55:18 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2010-04-12 14:55:18 +0000 |
| commit | a1c7301e3195f11f5544288228d53e82f4caeda8 (patch) | |
| tree | 3acfeac483626639648a1f6cafb515f9bc4383ec | |
| parent | 2811df2c90f5b2d5c3e06ff5b55eb44cbafa4250 (diff) | |
| download | emacs-a1c7301e3195f11f5544288228d53e82f4caeda8.tar.gz | |
Reverse 2010-03-01T11:31:42Z!acm@muc.de: "Fix bug #5649: 23.1.92; Indentation problems in C mode.".
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 08483c3a61d..cf685114cde 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -293,11 +293,6 @@ (otf-script-alist): Likewise. (setup-default-fontset): Likewise. Re-fix :otf spec. -2010-03-01 Alan Mackenzie <bug-cc-mode@gnu.org> - - * cc-engine.el (c-remove-stale-state-cache): Take account of when - `good-pos' is in the same macro as `here'. Fixes bug#5649. - 2010-02-28 Katsumi Yamaoka <yamaoka@jpl.org> * menu-bar.el (menu-bar-manuals-menu): Fix typo. diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 4797cd4a8ca..336e2c39262 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -2641,8 +2641,7 @@ comment at the start of cc-engine.el for more info." ;; (car c-state-cache). There can be no open parens/braces/brackets ;; 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)) + (setq pos (if good-pos-actual-macro-end (1+ good-pos-actual-macro-end) ; get outside the macro as ; marked by a `category' text property. good-pos)) |