From 64b53a1f5a6e4cc53763d3d8879d7509ceae5e6a Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Sat, 20 Oct 2007 23:55:30 +0000 Subject: (fill-paragraph): When the region is active, don't try other `or' branches regardless of the value returned by fill-region; just return t. --- lisp/textmodes/fill.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/textmodes/fill.el') 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 -- cgit v1.2.3 From 72229917b19701499430f1e6dc5ab401aecd5c99 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Fri, 26 Oct 2007 20:35:31 +0000 Subject: (fill-nobreak-p): Replace obsolete alias line-move-invisible-p with invisible-p, it was removed on 2007-08-29. --- lisp/ChangeLog | 6 ++++++ lisp/textmodes/fill.el | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'lisp/textmodes/fill.el') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 697789e7e17..e42a3b39df0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2007-10-26 Dan Nicolaescu + + * textmodes/fill.el (fill-nobreak-p): Replace obsolete alias + line-move-invisible-p with invisible-p, it was removed on + 2007-08-29. + 2007-10-26 Juanma Barranquero * files.el (kill-emacs-query-functions): Doc fix; diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index 9723568f220..6a0eb7a42cc 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. -- cgit v1.2.3