diff options
| author | Juri Linkov <[email protected]> | 2007-10-20 23:55:30 +0000 |
|---|---|---|
| committer | Juri Linkov <[email protected]> | 2007-10-20 23:55:30 +0000 |
| commit | 64b53a1f5a6e4cc53763d3d8879d7509ceae5e6a (patch) | |
| tree | 4d3319a2e3ef3760e0cd150c8568d905923da691 /lisp | |
| parent | 675007bc7c8f84bc3eafe62f908278f89c7c129a (diff) | |
(fill-paragraph): When the region is active, don't try other `or' branches
regardless of the value returned by fill-region; just return t.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/textmodes/fill.el | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8d1c808404..886e8b62f8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2007-10-20 Juri Linkov <[email protected]> + + * 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 <[email protected]> * vc.el (vc-do-command): Condition out a misleading message when diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index ca89fc7a83..9723568f22 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 |