(fill-move-to-break-point): Don't inhibit

fill-nobreak-predicate when the break is past fill-column.

2 files changed, 15 insertions, 11 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 569ed8ae6ab..ea94991f59a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/fill.el (fill-move-to-break-point): Don't inhibit
+        fill-nobreak-predicate when the break is past fill-column.
+
 2007-04-20  Francesco Potort=8ec  <pot@gnu.org>
 
         * locate.el (locate): Output from shell-command should go in the
@@ -113,8 +118,8 @@
 
         * textmodes/bibtex.el (bibtex-insert-kill): Pass non-nil NODELIM
         arg to bibtex-make-field.
-        (bibtex-make-field): Add optional fourth arg NODELIM.  Insert
-        delimiters around INIT unless this arg is non-nil.
+        (bibtex-make-field): Add optional fourth arg NODELIM.
+        Insert delimiters around INIT unless this arg is non-nil.
 
 2007-04-14  Nick Roberts  <nickrob@snap.net.nz>
 
@@ -152,7 +157,7 @@
         window marked as dedicated.
 
         * mail/footnote.el (footnote-latin-string): New variable.
-        (footnote-latin-regexp): Redefined as regexp alternative.
+        (footnote-latin-regexp): Redefine as regexp alternative.
         (Footnote-latin): Use footnote-latin-string instead of
         footnote-latin-regexp.
 
@@ -182,17 +187,17 @@
 
 2007-04-11  Markus Triska  <markus.triska@gmx.at>
 
-        * emacs-lisp/byte-opt.el (byte-optimize-backward-char)
-        (byte-optimize-backward-word): Remove (move to bytecomp.el).
+        * emacs-lisp/byte-opt.el (byte-optimize-backward-char)
+        (byte-optimize-backward-word): Remove (move to bytecomp.el).
         (byte-optimize-form-code-walker): Evaluate pure function calls if
         possible.
         (byte-optimize-all-constp): New function.
 
-        * emacs-lisp/bytecomp.el (byte-compile-char-before): Improve
-        numeric argument case.
-        (byte-compile-backward-char, byte-compile-backward-word): New
-        functions, performing rewriting previously done in byte-opt.el.
-        Fix their "Fixme" item (restriction to numeric arguments).
+        * emacs-lisp/bytecomp.el (byte-compile-char-before):
+        Improve numeric argument case.
+        (byte-compile-backward-char, byte-compile-backward-word):
+        New functions, performing rewriting previously done in byte-opt.el.
+        Fix their "Fixme" item (restriction to numeric arguments).
 
 2007-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 7318a52d8a9..7b4f73c2d1f 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -521,7 +521,6 @@ The break position will be always after LINEBEG and generally before point."
       ;; Ok, skip at least one word or one \c| character.
       ;; Meanwhile, don't stop at a period followed by one space.
       (let ((to (line-end-position))
-            (fill-nobreak-predicate nil) ;to break sooner.
             (first t))
         (goto-char linebeg)
         (while (and (< (point) to) (or first (fill-nobreak-p)))