1 files changed, 13 insertions, 11 deletions
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index b17703b0305..112fa50ce8f 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -3974,17 +3974,19 @@ 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).
-                    (or (<= (- (cdr c-lit-limits) 2) (point))
+;                   (or (<= (- (cdr c-lit-limits) 2) (point))
-                        (and 
+; 2010-10-17  Construct removed.
-                         (search-forward-regexp
+;                   (or (< (- (cdr c-lit-limits) 2) (point))
-                          (concat "\\=[ \t]*\\(" c-current-comment-prefix "\\)")
+                    (and 
-                          (- (cdr c-lit-limits) 2) t)
+                     (search-forward-regexp
-                         (not (search-forward-regexp
+                      (concat "\\=[ \t]*\\(" c-current-comment-prefix "\\)")
-                               "\\(\\s \\|\\sw\\)"
+                      (- (cdr c-lit-limits) 2) t)
-                               (- (cdr c-lit-limits) 2) 'limit))
+                     (not (search-forward-regexp
-                         ;; The comment ender IS on its own line.  Exclude
+                           "\\(\\s \\|\\sw\\)"
-                         ;; this line from the filling.
+                           (- (cdr c-lit-limits) 2) 'limit))
-                         (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

diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index b17703b0305..112fa50ce8f 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el
@@ -3974,17 +3974,19 @@ command to conveniently insert and align the necessary backslashes."
3974	;; "Invalid search bound (wrong side of point)"	3974	;; "Invalid search bound (wrong side of point)"
3975	;; error in the subsequent re-search. Maybe	3975	;; error in the subsequent re-search. Maybe
3976	;; another fix would be needed (2007-12-08).	3976	;; another fix would be needed (2007-12-08).
3977	(or (<= (- (cdr c-lit-limits) 2) (point))	3977	; (or (<= (- (cdr c-lit-limits) 2) (point))
3978	(and	3978	; 2010-10-17 Construct removed.
3979	(search-forward-regexp	3979	; (or (< (- (cdr c-lit-limits) 2) (point))
3980	(concat "\\=[ \t]*\\(" c-current-comment-prefix "\\)")	3980	(and
3981	(- (cdr c-lit-limits) 2) t)	3981	(search-forward-regexp
3982	(not (search-forward-regexp	3982	(concat "\\=[ \t]*\\(" c-current-comment-prefix "\\)")
3983	"\\(\\s \\\|\\sw\\)"	3983	(- (cdr c-lit-limits) 2) t)
3984	(- (cdr c-lit-limits) 2) 'limit))	3984	(not (search-forward-regexp
3985	;; The comment ender IS on its own line. Exclude	3985	"\\(\\s \\\|\\sw\\)"
3986	;; this line from the filling.	3986	(- (cdr c-lit-limits) 2) 'limit))
3987	(set-marker end (c-point 'bol)))))	3987	;; The comment ender IS on its own line. Exclude this
		3988	;; line from the filling.
		3989	(set-marker end (c-point 'bol))));)
3988		3990
3989	;; The comment ender is hanging. Replace all space between it	3991	;; The comment ender is hanging. Replace all space between it
3990	;; and the last word either by one or two 'x's (when	3992	;; and the last word either by one or two 'x's (when