diff options
| author | Miles Bader <miles@gnu.org> | 2007-01-30 22:22:43 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-01-30 22:22:43 +0000 |
| commit | bb5b9e9dbe671b0525692acf1337efa271b33fb6 (patch) | |
| tree | 810c31e2c5f1bc8e79df0cc4b121a25a9d4b8642 /lisp/textmodes/fill.el | |
| parent | f3df78db7218a084cbd58dc9a3cb5b9909b02d4d (diff) | |
| parent | 41e49ce63ee2f9945ff99a19b00752ea887ef506 (diff) | |
| download | emacs-bb5b9e9dbe671b0525692acf1337efa271b33fb6.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 615-621)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 197-199)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-166
Diffstat (limited to 'lisp/textmodes/fill.el')
| -rw-r--r-- | lisp/textmodes/fill.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index c684a1e2e8f..0f7767697fe 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -52,7 +52,8 @@ A value of nil means that any change in indentation starts a new paragraph." (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.") @@ -766,7 +767,8 @@ If `fill-paragraph-function' is nil, return the `fill-prefix' used for filling." (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 @@ -778,7 +780,7 @@ If `fill-paragraph-function' is nil, return the `fill-prefix' used for filling." ;; 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 |