[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r102735: (allout-auto-fill): Do not i
From: |
Ken Manheimer |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r102735: (allout-auto-fill): Do not infinitely recurse - use do-auto-fill if |
Date: |
Sat, 01 Jan 2011 19:35:15 -0500 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 102735
committer: Ken Manheimer <address@hidden>
branch nick: trunk
timestamp: Sat 2011-01-01 19:35:15 -0500
message:
(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.
modified:
lisp/allout.el
=== modified file 'lisp/allout.el'
--- a/lisp/allout.el 2010-12-28 19:57:15 +0000
+++ b/lisp/allout.el 2011-01-02 00:35:15 +0000
@@ -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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r102735: (allout-auto-fill): Do not infinitely recurse - use do-auto-fill if,
Ken Manheimer <=