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

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

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d1c808404f..886e8b62f88 100644
--- 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 ca89fc7a83c..9723568f220 100644
--- 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