[Emacs-diffs] Changes to emacs/lisp/textmodes/fill.el,v

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       07/01/28 07:13:10

Index: fill.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/textmodes/fill.el,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -b -r1.198 -r1.199
--- fill.el     21 Jan 2007 03:53:09 -0000      1.198
+++ fill.el     28 Jan 2007 07:13:10 -0000      1.199
@@ -52,7 +52,8 @@
 
 (defvar fill-paragraph-function nil
   "Mode-specific function to fill a paragraph, or nil if there is none.
-If the function returns nil, then `fill-paragraph' does its normal work.")
+If the function returns nil, then `fill-paragraph' does its normal work.
+A value of t means explicitly \"do nothing special\".")
 
 (defvar fill-paragraph-handle-comment t
   "Non-nil means paragraph filling will try to pay attention to comments.")
@@ -761,7 +762,8 @@
                 (barf-if-buffer-read-only)
                 (list (if current-prefix-arg 'full))))
   ;; First try fill-paragraph-function.
-  (or (and (or fill-paragraph-function
+  (or (and (not (eq fill-paragraph-function t))
+          (or fill-paragraph-function
               (and (minibufferp (current-buffer))
                    (= 1 (point-min))))
           (let ((function (or fill-paragraph-function
@@ -773,7 +775,7 @@
                 ;; fill-paragraph-handle-comment back to t explicitly or
                 ;; return nil.
                 (fill-paragraph-handle-comment nil)
-                fill-paragraph-function)
+                (fill-paragraph-function t))
             (funcall function arg)))
       ;; Then try our syntax-aware filling code.
       (and fill-paragraph-handle-comment