From: Alan Mackenzie <acm@muc.de>
Date: Tue, 31 Jan 2012 21:59:58 +0000 (+0000)
Subject: Fix an off by one error in c-guess-basic-syntax CASE 5B.1.
X-Git-Tag: emacs-pretest-24.0.94~362^2~17
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=abbceb009c33d3fcb19a967555464efb3b3f73aa;p=emacs.git

Fix an off by one error in c-guess-basic-syntax CASE 5B.1.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0146dd8652f..71f96cccfeb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-31  Alan Mackenzie  <acm@muc.de>
+
+	* progmodes/cc-engine.el (c-guess-basic-syntax): CASE 5B.1: Fix an
+	off by one error.
+
 2012-01-31  Chong Yidong  <cyd@gnu.org>
 
 	* frame.el (set-frame-font): New arg ALL-FRAMES.
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 25344fe96a7..52f18a89849 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -9447,7 +9447,7 @@ comment at the start of cc-engine.el for more info."
 
 	   ;; CASE 5B.1: Member init list.
 	   ((eq (char-after tmp-pos) ?:)
-	    (if (or (> tmp-pos indent-point)
+	    (if (or (>= tmp-pos indent-point)
 		    (= (c-point 'bosws) (1+ tmp-pos)))
 		(progn
 		  ;; There is no preceding member init clause.