Merge from emacs--devo--0

[gnu-emacs] / lisp / textmodes / fill.el

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 9cbdca0de87d2fa23db1cfccce6a014558bde1d8..27c425de4483d9297c6b0c2c3e6eb69657ca2612 100644 (file)
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -344,7 +344,7 @@ be tested.  If it returns t, fill commands do not break the line there."
 Can be customized with the variables `fill-nobreak-predicate'
 and `fill-nobreak-invisible'."
   (or
-   (and fill-nobreak-invisible (line-move-invisible-p (point)))
+   (and fill-nobreak-invisible (invisible-p (point)))
    (unless (bolp)
     (or
      ;; Don't break after a period followed by just one space.
@@ -780,7 +780,7 @@ in the active region."
    ;; 1. Fill the region if it is active when called interactively.
    (and region transient-mark-mode mark-active
        (not (eq (region-beginning) (region-end)))
-       (fill-region (region-beginning) (region-end) justify))
+       (or (fill-region (region-beginning) (region-end) justify) t))
    ;; 2. Try fill-paragraph-function.
    (and (not (eq fill-paragraph-function t))
        (or fill-paragraph-function