Merged in changes from CVS trunk.
Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-558 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-559 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-560 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-561 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-562 Update from CVS: lisp/subr.el (after-change-major-mode-hook): Doc fix. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-563 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-564 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-565 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-30 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-249
This commit is contained in:
commit
7238837d02
69 changed files with 1792 additions and 691 deletions
|
@ -1950,12 +1950,13 @@ in BODY."
|
|||
(put 'delay-mode-hooks 'permanent-local t)
|
||||
|
||||
(defvar after-change-major-mode-hook nil
|
||||
"Mode independent hook run at the end of major mode functions.
|
||||
This is run just before the mode dependent hooks.")
|
||||
"Normal hook run at the very end of major mode functions.")
|
||||
|
||||
(defun run-mode-hooks (&rest hooks)
|
||||
"Run mode hooks `delayed-mode-hooks' and HOOKS, or delay HOOKS.
|
||||
Execution is delayed if `delay-mode-hooks' is non-nil.
|
||||
If `delay-mode-hooks' is nil, run `after-change-major-mode-hook'
|
||||
after running the mode hooks.
|
||||
Major mode functions should use this."
|
||||
(if delay-mode-hooks
|
||||
;; Delaying case.
|
||||
|
@ -1964,8 +1965,8 @@ Major mode functions should use this."
|
|||
;; Normal case, just run the hook as before plus any delayed hooks.
|
||||
(setq hooks (nconc (nreverse delayed-mode-hooks) hooks))
|
||||
(setq delayed-mode-hooks nil)
|
||||
(run-hooks 'after-change-major-mode-hook)
|
||||
(apply 'run-hooks hooks)))
|
||||
(apply 'run-hooks hooks)
|
||||
(run-hooks 'after-change-major-mode-hook)))
|
||||
|
||||
(defmacro delay-mode-hooks (&rest body)
|
||||
"Execute BODY, but delay any `run-mode-hooks'.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue