diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2007-10-30 09:44:17 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2007-10-30 09:44:17 +0000 |
| commit | d83fb2569eb32420835f9534ad1d56e319f22c4b (patch) | |
| tree | 41e050668308c7527afdb387d1abd38c75d96721 /lisp | |
| parent | ae7c60a92ee348f6aba2149283d024471a0ea5f6 (diff) | |
| download | emacs-d83fb2569eb32420835f9534ad1d56e319f22c4b.tar.gz emacs-d83fb2569eb32420835f9534ad1d56e319f22c4b.tar.bz2 emacs-d83fb2569eb32420835f9534ad1d56e319f22c4b.zip | |
(unload-feature): Remove redundant check.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/loadhist.el | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d456bedce15..74cc696f593 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2007-10-30 Juanma Barranquero <lekktu@gmail.com> + + * loadhist.el (unload-feature): Remove redundant check. + 2007-10-30 Richard Stallman <rms@gnu.org> * savehist.el (savehist-save): Obey savehist-ignored-variables. @@ -16,8 +20,8 @@ * follow.el (follow-unload-function): Add docstring. (follow-unload-function): Remove variable. - * server.el (server-unload-function): Unbind `server-edit' from `C-x #'. - (server-unload-function): Remove variable. + * server.el (server-unload-function): Remove variable. + (server-unload-function): Unbind `server-edit' from `C-x #'. * uniquify.el (uniquify-unload-function): Add docstring. (uniquify-unload-function): Remove variable. diff --git a/lisp/loadhist.el b/lisp/loadhist.el index 5343c3cf34b..fb6a1c0389f 100644 --- a/lisp/loadhist.el +++ b/lisp/loadhist.el @@ -200,7 +200,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 unload-func (fboundp 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 |