diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-27 09:12:07 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-27 09:12:07 +0000 |
| commit | 18cd1f1a08833b0baad21c1d7b13a6845d95cf57 (patch) | |
| tree | 03f33df7513d15bd5de0348aec35ef82bd061508 /lisp/textmodes/fill.el | |
| parent | 74863e7a78b1c8da1094a8250660a009c3b23015 (diff) | |
| parent | fdc9061358d3654e14bfc1419632e1d6c6c5c13e (diff) | |
| download | emacs-18cd1f1a08833b0baad21c1d7b13a6845d95cf57.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 902-908)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
Diffstat (limited to 'lisp/textmodes/fill.el')
| -rw-r--r-- | lisp/textmodes/fill.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index 9cbdca0de87..27c425de448 100644 --- 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 |