(fill-paragraph):

Bind fill-paragraph-function to nil, if it doesn't do the job.

1 files changed, 4 insertions, 1 deletions

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 3bafa4a82d6..4f0d16ffc68 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -572,7 +572,10 @@ argument to it), and if it returns non-nil, we simply return its value."
            (let ((function fill-paragraph-function)
                  fill-paragraph-function)
              (funcall function arg)))
-      (let ((before (point)))
+      (let ((before (point))
+            ;; If fill-paragraph is called recursively,
+            ;; don't give fill-paragraph-function a second chance.
+            fill-paragraph-function)
         (save-excursion
           (forward-paragraph)
           (or (bolp) (newline 1))