mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-30 04:10:54 -08:00
(fill-paragraph-function): Doc fix.
(fill-paragraph): Bind fill-paragraph-function to t to avoid recursion.
This commit is contained in:
parent
f61eed1d1a
commit
bbc02d0063
1 changed files with 5 additions and 3 deletions
|
|
@ -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.")
|
||||
|
|
@ -761,7 +762,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
|
||||
|
|
@ -773,7 +775,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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue