Fixes for f90.el filling in comments (bug#9553)

* lisp/progmodes/f90.el (f90-break-line): If breaking inside comment delete
all whitespace around breakpoint.
(f90-find-breakpoint): Only break at whitespace inside a comment.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3c2eb430f304d519fa0dec9882ccadfabbf5906e..2f4f70512500dfe49d617ff093daa1657b1f4449 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-20  Lawrence Mitchell  <wence@gmx.li>
+
+       * progmodes/f90.el (f90-break-line): If breaking inside comment delete
+       all whitespace around breakpoint.  (Bug#9553)
+       (f90-find-breakpoint): Only break at whitespace inside a comment.
+
 2011-09-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * minibuffer.el (completion-file-name-table): Keep track of errors.

diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index cdb5f2a715d765d9a721615171c77e4009891fc6..7d239736dc130a1777b037caa93456aabcf362a0 100644 (file)
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -2000,7 +2000,7 @@ is non-nil, call `f90-update-line' after inserting the continuation marker."
   (cond ((f90-in-string)
          (insert "&\n&"))
         ((f90-in-comment)
-         (delete-horizontal-space 'backwards) ; remove trailing whitespace
+         (delete-horizontal-space) ; remove trailing whitespace
          (insert "\n" (f90-get-present-comment-type)))
         (t (insert "&")
            (or no-update (f90-update-line))
@@ -2012,7 +2012,9 @@ is non-nil, call `f90-update-line' after inserting the continuation marker."
 
 (defun f90-find-breakpoint ()
   "From `fill-column', search backward for break-delimiter."
-  (re-search-backward f90-break-delimiters (line-beginning-position))
+  (if (f90-in-comment)
+      (re-search-backward "\\s-" (line-beginning-position))
+    (re-search-backward f90-break-delimiters (line-beginning-position)))
   (if (not f90-break-before-delimiters)
       (forward-char (if (looking-at f90-no-break-re) 2 1))
     (backward-char)