# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1083351131 0
# Node ID d5d0f1479a4a09bf8bb8271bda70312cc9847223
# Parent  c51143d3c64433cd2208fbb5e44f979d8fb9fffb
(f90-get-present-comment-type): Return whitespace, as well as comment
chars, for consistent filling of comment blocks.  Use
`match-string-no-properties'.
(f90-break-line): Do not leave trailing whitespace when filling
comments.

diff -r c51143d3c644 -r d5d0f1479a4a lisp/progmodes/f90.el
--- a/lisp/progmodes/f90.el	Fri Apr 30 18:50:08 2004 +0000
+++ b/lisp/progmodes/f90.el	Fri Apr 30 18:52:11 2004 +0000
@@ -850,14 +850,16 @@
 
 (defsubst f90-get-present-comment-type ()
   "If point lies within a comment, return the string starting the comment.
-For example, \"!\" or \"!!\"."
+For example, \"!\" or \"!!\", followed by the appropriate amount of
+whitespace, if any."
+  ;; Include the whitespace for consistent auto-filling of comment blocks.
   (save-excursion
     (when (f90-in-comment)
       (beginning-of-line)
-      (re-search-forward "!+" (line-end-position))
+      (re-search-forward "!+[ \t]*" (line-end-position))
       (while (f90-in-string)
-        (re-search-forward "!+" (line-end-position)))
-      (match-string 0))))
+        (re-search-forward "!+[ \t]*" (line-end-position)))
+      (match-string-no-properties 0))))
 
 (defsubst f90-equal-symbols (a b)
   "Compare strings A and B neglecting case and allowing for nil value."
@@ -1519,6 +1521,7 @@
   (cond ((f90-in-string)
          (insert "&\n&"))
         ((f90-in-comment)
+         (delete-horizontal-space 'backwards) ; remove trailing whitespace
          (insert "\n" (f90-get-present-comment-type)))
         (t (insert "&")
            (or no-update (f90-update-line))