[Emacs-diffs] /srv/bzr/emacs/trunk r105848: Fixes for f90.el filling in comments (bug#9553)

[Glenn Morris]

------------------------------------------------------------
revno: 105848
fixes bug(s): http://debbugs.gnu.org/9553
author: Lawrence Mitchell <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2011-09-19 21:12:05 -0700
message:
  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.
modified:
  lisp/ChangeLog
  lisp/progmodes/f90.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-20 01:06:29 +0000
+++ b/lisp/ChangeLog    2011-09-20 04:12:05 +0000
@@ -1,3 +1,9 @@
+2011-09-20  Lawrence Mitchell  <address@hidden>
+
+       * 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  <address@hidden>
 
        * minibuffer.el (completion-file-name-table): Keep track of errors.

=== modified file 'lisp/progmodes/f90.el'
--- a/lisp/progmodes/f90.el     2011-06-26 01:37:36 +0000
+++ b/lisp/progmodes/f90.el     2011-09-20 04:12:05 +0000
@@ -2000,7 +2000,7 @@
   (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 @@
 
 (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)