Commit 54c6a1c4 authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

(unload-feature): Silently ignore `load-history' entries of the form `(defface

. SYMBOL)', and treat `(autoload . SYMBOL)' entries like `defun'.  Return nil.
parent 74a5d578
2007-02-05 Juanma Barranquero <lekktu@gmail.com>
* loadhist.el (unload-feature): Silently ignore `load-history' entries
of the form `(defface . SYMBOL)', and treat `(autoload . SYMBOL)'
entries like `defun'. Return nil.
2007-02-05 Kim F. Storm <storm@cua.dk>
 
* ido.el: Doc fixes.
......@@ -24,8 +30,8 @@
and insert the image directly.
(newsticker--buffer-redraw): Update docstring.
 
* emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Rename
from define-global-minor-mode.
* emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
Rename from define-global-minor-mode.
 
* progmodes/cwarn.el (global-cwarn-mode):
* emacs-lisp/autoload.el (make-autoload):
......@@ -215,7 +215,7 @@ such as redefining an Emacs function."
;; Remove any feature names that this file provided.
(provide
(setq features (delq (cdr x) features)))
(defun
((defun autoload)
(let ((fun (cdr x)))
(when (fboundp fun)
(when (fboundp 'ad-unadvise)
......@@ -224,7 +224,7 @@ such as redefining an Emacs function."
(if aload
(fset fun (cons 'autoload aload))
(fmakunbound fun))))))
((t require) nil)
((t require defface) nil)
(t (message "Unexpected element %s in load-history" x)))
;; Kill local values as much as possible.
(dolist (buf (buffer-list))
......@@ -238,7 +238,9 @@ such as redefining an Emacs function."
(unless (local-variable-if-set-p x)
(makunbound x))))
;; Delete the load-history element for this file.
(setq load-history (delq (assoc file load-history) load-history))))
(setq load-history (delq (assoc file load-history) load-history)))
;; Don't return load-history, it is not useful.
nil)
(provide 'loadhist)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment