From: Michaël Cadilhac <michael.cadilhac@lrde.org>
Date: Sun, 24 Dec 2006 20:23:31 +0000 (+0000)
Subject: (fill-comment-paragraph): Prevent the use of an optimized comment regexp if
X-Git-Tag: emacs-pretest-22.0.93~434
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2a096cafa0eac4afd665849424ba7fd21636fc20;p=emacs.git

(fill-comment-paragraph): Prevent the use of an optimized comment regexp if
`comment-start-skip' uses a ^.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 98c64bab784..048299c85ca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-24  Michaël Cadilhac  <michael.cadilhac@lrde.org>
+
+	* textmodes/fill.el (fill-comment-paragraph): Prevent the use of
+	an optimized comment regexp if `comment-start-skip' uses a ^.
+
 2006-12-24  Michaël Cadilhac  <michael.cadilhac@lrde.org>
 
 	* bs.el (bs--up): Remove interactive spec.
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index e5b3a64db84..3fec7a31b9f 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -838,7 +838,7 @@ can take care of filling.  JUSTIFY is used as in `fill-paragraph'."
 	     (commark
 	      (comment-string-strip (buffer-substring comstart comin) nil t))
 	     (comment-re
-	      (if (string-match comment-start-skip (concat commark "a"))
+	      (if (string-match comment-start-skip (concat "\0" commark "a"))
 		  (concat "[ \t]*" (regexp-quote commark)
 			  ;; Make sure we only match comments that use
 			  ;; the exact same comment marker.