diff options
| author | Miles Bader <miles@gnu.org> | 2007-11-11 00:56:44 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-11-11 00:56:44 +0000 |
| commit | f23d76bdefbd4c06e14d69e99e50d35ce91c8226 (patch) | |
| tree | ded28d1da6df2d0135514bac83074f4ca1c9099a /lisp/loadhist.el | |
| parent | e2d092da5980a7d05a5428074f8eb4925fa801e8 (diff) | |
| parent | a457417ee5ba797ab1c91d35ee957bb7a7f8d4b6 (diff) | |
| download | emacs-f23d76bdefbd4c06e14d69e99e50d35ce91c8226.tar.gz | |
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
Diffstat (limited to 'lisp/loadhist.el')
| -rw-r--r-- | lisp/loadhist.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/loadhist.el b/lisp/loadhist.el index 2e052d8cf96..0c1766143d6 100644 --- a/lisp/loadhist.el +++ b/lisp/loadhist.el @@ -120,16 +120,16 @@ from a file." '(after-change-functions after-insert-file-functions after-make-frame-functions auto-fill-function before-change-functions blink-paren-function buffer-access-fontify-functions command-line-functions - comment-indent-function compilation-finish-functions + comment-indent-function compilation-finish-functions delete-frame-functions disabled-command-function find-file-not-found-functions font-lock-beginning-of-syntax-function font-lock-fontify-buffer-function font-lock-fontify-region-function font-lock-mark-block-function font-lock-syntactic-face-function font-lock-unfontify-buffer-function font-lock-unfontify-region-function kill-buffer-query-functions kill-emacs-query-functions lisp-indent-function mouse-position-function - redisplay-end-trigger-functions temp-buffer-show-function - window-scroll-functions window-size-change-functions - write-contents-functions write-file-functions + redisplay-end-trigger-functions suspend-tty-functions + temp-buffer-show-function window-scroll-functions + window-size-change-functions write-contents-functions write-file-functions write-region-annotate-functions) "A list of special hooks from Info node `(elisp)Standard Hooks'. @@ -191,7 +191,7 @@ something strange, such as redefining an Emacs function." (unload-func (intern-soft (concat name "-unload-function")))) ;; If FEATURE-unload-function is defined and returns non-nil, ;; don't try to do anything more; otherwise proceed normally. - (unless (and (bound-and-true-p unload-func) + (unless (and (fboundp unload-func) (funcall unload-func)) ;; Try to avoid losing badly when hooks installed in critical ;; places go away. (Some packages install things on |