summaryrefslogtreecommitdiff
path: root/lisp/loadhist.el
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1995-05-18 16:51:35 +0000
committerKarl Heuer <kwzh@gnu.org>1995-05-18 16:51:35 +0000
commitc344d4be628e9893d7ed9f0dea87abdd7e64d93c (patch)
tree690e67542ae774a04b5c320e58b1b7c7e1e75e55 /lisp/loadhist.el
parent2860be63dda486c907ca8f2935309f4a8ce8fa31 (diff)
downloademacs-c344d4be628e9893d7ed9f0dea87abdd7e64d93c.tar.gz
(unload-feature): When we come to (provide . FEATURE),
remove FEATURE from the features list.
Diffstat (limited to 'lisp/loadhist.el')
-rw-r--r--lisp/loadhist.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index d541a701405..2a62ab51b0d 100644
--- 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)