# HG changeset patch
# User Alan Mackenzie <acm@muc.de>
# Date 1288526042 0
# Node ID 707dcc885f009e3dc1dd4da4629c7e3c23588a91
# Parent  6bf1738e57f0d43d0c52e6c5e84835b3bd510231
progmodes/cc-cmds.el (c-mask-paragraph): Fix an off-by-1 error.  Fixes
bug #7185.

diff -r 6bf1738e57f0 -r 707dcc885f00 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Oct 31 10:01:11 2010 +0000
+++ b/lisp/ChangeLog	Sun Oct 31 11:54:02 2010 +0000
@@ -1,3 +1,8 @@
+2010-10-31  Alan Mackenzie  <acm@muc.de>
+
+	* progmodes/cc-cmds.el (c-mask-paragraph): Fix an off-by-1 error.
+	This fixes bug #7185.
+
 2010-10-30  Chong Yidong  <cyd@stupidchicken.com>
 
 	* startup.el (command-line): Search for package directories, and
diff -r 6bf1738e57f0 -r 707dcc885f00 lisp/progmodes/cc-cmds.el
--- a/lisp/progmodes/cc-cmds.el	Sun Oct 31 10:01:11 2010 +0000
+++ b/lisp/progmodes/cc-cmds.el	Sun Oct 31 11:54:02 2010 +0000
@@ -3974,17 +3974,19 @@
 		    ;; "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))
-			(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)))))
+;		    (or (<= (- (cdr c-lit-limits) 2) (point))
+; 2010-10-17  Construct removed.
+;		    (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 hanging.  Replace all space between it
 		;; and the last word either by one or two 'x's (when