(fill-paragraph): Bind fill-paragraph-function to nil before calling it.

diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 79714d91c1c8cf5ce9247adf8b46f0284ea5ecfa..dc70406a3267240090746ae3b939cc104fd80bf9 100644 (file)
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -326,7 +326,9 @@ If `fill-paragraph-function' is non-nil, we call it (passing our
 argument to it), and if it returns non-nil, we simply return its value."
   (interactive "P")
   (or (and fill-paragraph-function
-          (funcall fill-paragraph-function arg))
+          (let ((function fill-paragraph-function)
+                fill-paragraph-function)
+            (funcall function arg)))
       (let ((before (point)))
        (save-excursion
          (forward-paragraph)