(unload-feature): Remove redundant check.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d456bedce15616aab4862d83a9afbd1150132fe1..74cc696f5937d8659145cd1c1e0899c5ec63ce4e 100644 (file)
--- 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 5343c3cf34bde1632d0cba229becae67941418f9..fb6a1c0389f012f0c0e717f7156c31254e29ffa1 100644 (file)
--- 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