Index: lisp/textmodes/fill.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/textmodes/fill.el,v
retrieving revision 1.192
diff -c -r1.192 fill.el
*** lisp/textmodes/fill.el	6 Nov 2006 16:01:53 -0000	1.192
--- lisp/textmodes/fill.el	24 Dec 2006 00:12:07 -0000
***************
*** 838,844 ****
  	     (commark
  	      (comment-string-strip (buffer-substring comstart comin) nil t))
  	     (comment-re
! 	      (if (string-match comment-start-skip (concat commark "a"))
  		  (concat "[ \t]*" (regexp-quote commark)
  			  ;; Make sure we only match comments that use
  			  ;; the exact same comment marker.
--- 838,844 ----
  	     (commark
  	      (comment-string-strip (buffer-substring comstart comin) nil t))
  	     (comment-re
! 	      (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.
Index: lisp/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.10475
diff -C0 -r1.10475 ChangeLog
*** lisp/ChangeLog	23 Dec 2006 19:06:59 -0000	1.10475
--- lisp/ChangeLog	24 Dec 2006 00:13:34 -0000
***************
*** 0 ****
--- 1,5 ----
+ 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 ^.
+