(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 98c64bab784d290864b6212f89ef4d0bbf132224..048299c85ca0eda7b2a761d6bc2d308ff4f83c67 100644 (file)
--- 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 e5b3a64db846904811dd903fd99a0f929f282dad..3fec7a31b9fc728b7c1e0e220cc0328071a8c6dc 100644 (file)
--- 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.