(fill-comment-paragraph): Prevent the use of an optimized comment regexp if

`comment-start-skip' uses a ^.

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 98c64bab784..048299c85ca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 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.
 
 2006-12-24  Chong Yidong  <cyd@stupidchicken.com>
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.