Mercurial > emacs
changeset 75474:cf580adfa498
(fill-paragraph-function): Doc fix.
(fill-paragraph): Bind fill-paragraph-function to t to avoid recursion.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 28 Jan 2007 07:13:10 +0000 |
| parents | 869eaab96a64 |
| children | 688a9d290d4d |
| files | lisp/textmodes/fill.el |
| diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/textmodes/fill.el Sun Jan 28 07:11:24 2007 +0000 +++ b/lisp/textmodes/fill.el Sun Jan 28 07:13:10 2007 +0000 @@ -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