summaryrefslogtreecommitdiff
path: root/lisp/progmodes/cc-engine.el
diff options
context:
space:
mode:
authorAlan Mackenzie <acm@muc.de>2010-04-12 14:55:18 +0000
committerAlan Mackenzie <acm@muc.de>2010-04-12 14:55:18 +0000
commita1c7301e3195f11f5544288228d53e82f4caeda8 (patch)
tree3acfeac483626639648a1f6cafb515f9bc4383ec /lisp/progmodes/cc-engine.el
parent2811df2c90f5b2d5c3e06ff5b55eb44cbafa4250 (diff)
downloademacs-a1c7301e3195f11f5544288228d53e82f4caeda8.tar.gz
Reverse 2010-03-01T11:31:42Z!acm@muc.de: "Fix bug #5649: 23.1.92; Indentation problems in C mode.".
Diffstat (limited to 'lisp/progmodes/cc-engine.el')
-rw-r--r--lisp/progmodes/cc-engine.el3
1 files changed, 1 insertions, 2 deletions
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))