Mercurial > emacs
changeset 112044:38481fb0a538
(allout-auto-fill): Do not infinitely recurse - use do-auto-fill if
everything points back to allout-auto-fill.
(allout-mode-deactivate-hook): Declare obsolete, in favor of
standard-formed minor-mode deactivate hook, allout-mode-off-hook.
| author | Ken Manheimer <ken.manheimer@gmail.com> |
|---|---|
| date | Sat, 01 Jan 2011 19:35:15 -0500 |
| parents | dffe14ef6b65 |
| children | 52100bac91db |
| files | lisp/allout.el |
| diffstat | 1 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/allout.el Sat Jan 01 01:02:36 2011 -0500 +++ b/lisp/allout.el Sat Jan 01 19:35:15 2011 -0500 @@ -1432,6 +1432,8 @@ ;;;_ = allout-mode-deactivate-hook (defvar allout-mode-deactivate-hook nil "*Hook that's run when allout mode ends.") +(define-obsolete-variable-alias 'allout-mode-deactivate-hook + 'allout-mode-off-hook "future") ;;;_ = allout-exposure-category (defvar allout-exposure-category nil "Symbol for use as allout invisible-text overlay category.") @@ -3983,9 +3985,13 @@ (make-string (progn (allout-end-of-prefix) (current-column)) ?\ )))))) - (use-auto-fill-function (or allout-outside-normal-auto-fill-function - auto-fill-function - 'do-auto-fill))) + (use-auto-fill-function + (if (and (eq allout-outside-normal-auto-fill-function + 'allout-auto-fill) + (eq auto-fill-function 'allout-auto-fill)) + 'do-auto-fill + (or allout-outside-normal-auto-fill-function + auto-fill-function)))) (if (or allout-former-auto-filler allout-use-hanging-indents) (funcall use-auto-fill-function))))) ;;;_ > allout-reindent-body (old-depth new-depth &optional number)