(fill-paragraph): Give up if there's no paragraph at or after point.

2 files changed, 19 insertions, 12 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 520a551bcbf..eb8bf3d0cf9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2002-10-03  Stefan Monnier  <monnier@cs.yale.edu>
 
+        * textmodes/fill.el (fill-paragraph): Give up if there's no
+        paragraph at or after point.
+
+        * textmodes/paragraphs.el (forward-paragraph): Return the steps left.
+
         * vc.el (vc-print-log): Unconditionally use `show-log-entry'.
         (vc-default-show-log-entry): New fun.
 
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 8c5a8d35d1a..0bf4b3e5cef 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -697,18 +697,20 @@ If `fill-paragraph-function' is nil, return the `fill-prefix' used for filling."
             ;; Fill prefix used for filling the paragraph.
             fill-pfx)
         (save-excursion
-          (forward-paragraph)
-          (or (bolp) (newline 1))
-          (let ((end (point))
-                (beg (progn (backward-paragraph) (point))))
-            (goto-char before)
-            (setq fill-pfx
-                  (if use-hard-newlines
-                      ;; Can't use fill-region-as-paragraph, since this
-                      ;; paragraph may still contain hard newlines.  See
-                      ;; fill-region.
-                      (fill-region beg end arg)
-                    (fill-region-as-paragraph beg end arg)))))
+          (if (not (zerop (forward-paragraph)))
+              ;; There's no paragraph at or after point: give up.
+              (setq fill-pfx "")
+            (or (bolp) (newline 1))
+            (let ((end (point))
+                  (beg (progn (backward-paragraph) (point))))
+              (goto-char before)
+              (setq fill-pfx
+                    (if use-hard-newlines
+                        ;; Can't use fill-region-as-paragraph, since this
+                        ;; paragraph may still contain hard newlines.  See
+                        ;; fill-region.
+                        (fill-region beg end arg)
+                      (fill-region-as-paragraph beg end arg))))))
         ;; See if point ended up inside the fill-prefix, and if so, move
         ;; past it.
         (skip-line-prefix fill-pfx)