projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(K0-6B31): Unify KU+8AED and HD-IB2932.
[chise/xemacs-chise.git-]
/
lisp
/
loadhist.el
diff --git
a/lisp/loadhist.el
b/lisp/loadhist.el
index
7783fd3
..
228aa09
100644
(file)
--- a/
lisp/loadhist.el
+++ b/
lisp/loadhist.el
@@
-123,7
+123,11
@@
is nil, raise an error."
(when dependents
(error "Loaded libraries %s depend on %s"
(prin1-to-string dependents) file))))
(when dependents
(error "Loaded libraries %s depend on %s"
(prin1-to-string dependents) file))))
- (let* ((flist (feature-symbols feature)) (file (car flist)))
+ (let* ((flist (feature-symbols feature))
+ (file (car flist)))
+ (flet ((reset-aload (x)
+ (let ((aload (get x 'autoload)))
+ (if aload (fset x (cons 'autoload aload))))))
(mapcar
#'(lambda (x)
(cond ((stringp x) nil)
(mapcar
#'(lambda (x)
(cond ((stringp x) nil)
@@
-131,12
+135,17
@@
is nil, raise an error."
;; Remove any feature names that this file provided.
(if (eq (car x) 'provide)
(setq features (delq (cdr x) features))))
;; Remove any feature names that this file provided.
(if (eq (car x) 'provide)
(setq features (delq (cdr x) features))))
- ((boundp x) (makunbound x))
+ ((and (boundp x)
+ (fboundp x))
+ (makunbound x)
+ (fmakunbound x)
+ (reset-aload x))
+ ((boundp x)
+ (makunbound x))
((fboundp x)
(fmakunbound x)
((fboundp x)
(fmakunbound x)
- (let ((aload (get x 'autoload)))
- (if aload (fset x (cons 'autoload aload)))))))
- (cdr flist))
+ (reset-aload x))))
+ (cdr flist)))
;; Delete the load-history element for this file.
(let ((elt (assoc file load-history)))
(setq load-history (delq elt load-history)))))
;; Delete the load-history element for this file.
(let ((elt (assoc file load-history)))
(setq load-history (delq elt load-history)))))