2 files changed, 16 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5e4bd5ed83e..bbcca326542 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-23  Glenn Morris  <gmorris@ast.cam.ac.uk>
+
+        * progmodes/f90.el (f90-do-auto-fill): Respect the value of
+        comment-auto-fill-only-comments.
+
 2002-06-21  Kai Gro,b_(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
         * net/ange-ftp.el (backup-buffer): Delete `ange-ftp' property.
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 5b34e8506b3..097f0bcba6b 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1624,13 +1624,17 @@ Update keyword case first."
   ;; position is beyond fill-column.
   ;; Will not break **, //, or => (as specified by f90-no-break-re).
   (f90-update-line)
-  (while (> (current-column) fill-column)
-    (let ((pos-mark (point-marker)))
-      (move-to-column fill-column)
-      (or (f90-in-string) (f90-find-breakpoint))
-      (f90-break-line)
-      (goto-char pos-mark)
-      (set-marker pos-mark nil))))
+  ;; Need this for `f90-electric-insert' and other f90- callers.
+  (unless (and (boundp 'comment-auto-fill-only-comments)
+               comment-auto-fill-only-comments
+               (not (f90-in-comment)))
+    (while (> (current-column) fill-column)
+      (let ((pos-mark (point-marker)))
+        (move-to-column fill-column)
+        (or (f90-in-string) (f90-find-breakpoint))
+        (f90-break-line)
+        (goto-char pos-mark)
+        (set-marker pos-mark nil)))))
 
 
 (defun f90-join-lines ()