From: Ken Manheimer Date: Sun, 2 Jan 2011 00:35:15 +0000 (-0500) Subject: (allout-auto-fill): Do not infinitely recurse - use do-auto-fill if X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~278^2~37 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7927f48d454f33668f9dcef6b2d9476d24fe54bb;p=emacs.git (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. --- diff --git a/lisp/allout.el b/lisp/allout.el index 37650e2ff39..8bc6b6fb6bb 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -1432,6 +1432,8 @@ their settings before allout-mode was started." ;;;_ = 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 @@ Maintains outline hanging topic indentation if (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)