Revert last change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7fbcc0c8fb67ac3bcafc606ce73f77b0dbd62780..569ed8ae6abef2c98369edb4bd4dccd79f611813 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,3 @@
-2007-04-20  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-       * textmodes/fill.el (fill-move-to-break-point): Don't bind
-       fill-nobreak-predicate.
-
 2007-04-20  Francesco Potort=8ec  <pot@gnu.org>
 
        * locate.el (locate): Output from shell-command should go in the

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 7b4f73c2d1fc1c78fe54d3077fb2f84600f4b428..7318a52d8a90ae1f6334a4329e169783cabeed7a 100644 (file)
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -521,6 +521,7 @@ 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)))