(unload-feature): When we come to (provide . FEATURE),

remove FEATURE from the features list.

diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index d541a70140599c67b77ade269ab46b63ddf489ee..2a62ab51b0deae78fda8fd71ee4cfd98271c48fa 100644 (file)
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -118,7 +118,10 @@ is nil, raise an error."
     (mapcar
      (function (lambda (x) 
                 (cond ((stringp x) nil)
-                      ((consp x) nil)
+                      ((consp x)
+                       ;; Remove any feature names that this file provided.
+                       (if (eq (car x) 'provide)
+                           (setq features (delq (cdr x) features))))
                       ((boundp x) (makunbound x))
                       ((fboundp x)
                        (fmakunbound x)