(fill-comment-paragraph): Be more careful when

recognizing leading comment on code line.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 145a95c62884ad33de0a4539b9fdd24210e9e42f..09605839013d91a77668bab56d3334a91ca7ccbc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2004-03-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * textmodes/fill.el (fill-comment-paragraph): Be more careful when
+       recognizing leading comment on code line.
+
+2004-03-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * textmodes/fill.el (fill-paragraph): Don't check comment-start-skip,
+       only comment-start (in case the mode hasn't set it).
+
+       * Makefile.in (AUTOGENEL): New var.
+       (bootstrap-prepare): Rename from bootstrap-clean.
+       Don't remove elc files.
+       (maintainer-clean): New target.
+
+       * xml.el (xml-get-attribute-or-nil): Simplify.
+
 2004-03-02  Juri Linkov  <juri@jurta.org>
 
        * net/browse-url.el (browse-url-netscape, browse-url-mozilla)

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 69cb7fd8d0619e275c5e394088c731e0f4bed708..7a794d67c5ecdc83fa9bc2317bbbcef3bf2395bc 100644 (file)
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -822,7 +822,11 @@ can take care of filling.  JUSTIFY is used as in `fill-paragraph'."
                             (looking-at comment-re)))
                 ;; We may have gone too far.  Go forward again.
                 (line-beginning-position
-                 (if (looking-at (concat ".*\\(?:" comment-start-skip "\\)"))
+                 (if (progn
+                       (goto-char
+                        (or (comment-search-forward (line-end-position) t)
+                            (point)))
+                       (looking-at comment-re))
                      1 2))))
           ;; Find the beginning of the first line past the region to fill.
           (save-excursion