(fill-region-as-paragraph): Avoid backing up

before left margin and fill-prefix by fill-find-break-point.

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index fe8e5250dc3daa678f197e9dd94261eaaf8594f9..8d38e7f6e0f0432666a035f2781582ca982d2659 100644 (file)
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -546,7 +546,11 @@ space does not end a sentence, so don't break a line there."
                      ;; character to find the correct break point.
                      (if (not (and (eq (charset-after (1- (point))) 'ascii)
                                    (eq (charset-after (point)) 'ascii)))
-                         (fill-find-break-point linebeg))))
+                         (fill-find-break-point
+                          (+ linebeg
+                             (current-left-margin)
+                             (if fill-prefix (string-width fill-prefix)
+                               0))))))
 
                ;; If the left margin and fill prefix by themselves
                ;; pass the fill-column, keep at least one word.