From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 29 Jul 2006 15:05:50 +0000 (+0000)
Subject: * loadhist.el (unload-feature): Handle new `(t . SYMBOL)' format
X-Git-Tag: emacs-pretest-22.0.90~1187
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c888d352a6ab60016749103398ab21b188634349;p=emacs.git

* loadhist.el (unload-feature): Handle new `(t . SYMBOL)' format
	for load-history elements.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf2b61f3756..6ee708c4392 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-29  Chong Yidong  <cyd@stupidchicken.com>
+
+	* loadhist.el (unload-feature): Handle new `(t . SYMBOL)' format
+	for load-history elements.
+
 2006-07-29  Eli Zaretskii  <eliz@gnu.org>
 
 	* files.el (convert-standard-filename): For Cygwin, replace
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 635059f93e5..61f15c8ef1c 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -222,8 +222,8 @@ such as redefining an Emacs function."
 		  (if aload
                       (fset fun (cons 'autoload aload))
                     (fmakunbound fun))))))
-           (require nil)
-           (t (message "Unexpected element %s in load-history" x)))
+           ((t require) nil)
+	   (t (message "Unexpected element %s in load-history" x)))
 	;; Kill local values as much as possible.
 	(dolist (buf (buffer-list))
 	  (with-current-buffer buf