(fill-paragraph): When the region is active, don't try other `or' branches

regardless of the value returned by fill-region; just return t.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d1c808404f3a944b121b758c70e78b58b6e25d9..886e8b62f888256b572578334cfc79f5a6e16c17 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-20  Juri Linkov  <juri@jurta.org>
+
+       * textmodes/fill.el (fill-paragraph): When the region is active,
+       don't try other `or' branches regardless of the value returned by
+       fill-region; just return t.
+
 2007-10-20  Eric S. Raymond  <esr@snark.thyrsus.com>
 
        * vc.el (vc-do-command): Condition out a misleading message when

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index ca89fc7a83ca502f3547120b0816e7839592dd94..9723568f2205fed72d001ee56662e8b726ccd41b 100644 (file)
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -775,7 +775,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