cc-cmds.el (c-mask-paragraph): Fix bug #6688, Auto-fill broken in C/C++

modes.

2 files changed, 10 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0332db2c9f..151fe8da2be 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-31  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-cmds.el (c-mask-paragraph): Fix bug #6688:
+        Auto-fill broken in C/C++ modes.
+
 2010-07-29  Jan Djärv  <jan.h.d@swipnet.se>
 
         * menu-bar.el (menu-bar-showhide-tool-bar-menu-customize-enable-left)
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 10267a6b2dc..6d4479cb204 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -3974,16 +3974,17 @@ command to conveniently insert and align the necessary backslashes."
                     ;; "Invalid search bound (wrong side of point)"
                     ;; error in the subsequent re-search.  Maybe
                     ;; another fix would be needed (2007-12-08).
-                    (and (> (- (cdr c-lit-limits) 2) (point))
+                    (or (<= (- (cdr c-lit-limits) 2) (point))
+                        (and 
                          (search-forward-regexp
                           (concat "\\=[ \t]*\\(" c-current-comment-prefix "\\)")
                           (- (cdr c-lit-limits) 2) t)
                          (not (search-forward-regexp
                                "\\(\\s \\|\\sw\\)"
                                (- (cdr c-lit-limits) 2) 'limit))
-                             ;; The comment ender IS on its own line.  Exclude
-                             ;; this line from the filling.
-                         (set-marker end (c-point 'bol))))
+                         ;; The comment ender IS on its own line.  Exclude
+                         ;; this line from the filling.
+                         (set-marker end (c-point 'bol)))))
 
                 ;; The comment ender is hanging.  Replace all space between it
                 ;; and the last word either by one or two 'x's (when