(unload-feature): Remove erroneous check for the FEATURE-unload-function

variable; check the existence of the function (that's what the docstring
says, and it makes more sense).

diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index cfc3f33168a89dc3fcc66bb457cd002af82c7844..5343c3cf34bde1632d0cba229becae67941418f9 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 (bound-and-true-p unload-func)
+    (unless (and unload-func (fboundp unload-func)
                 (funcall unload-func))
       ;; Try to avoid losing badly when hooks installed in critical
       ;; places go away.  (Some packages install things on