# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1154185550 0
# Node ID a17769ba1089e1da69df52dbf7f9d958a077e2b5
# Parent  391851b59b5a60d0e444d1b393cb468d22bf98b8
	* loadhist.el (unload-feature): Handle new `(t . SYMBOL)' format
	for load-history elements.

diff -r 391851b59b5a -r a17769ba1089 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jul 29 12:06:07 2006 +0000
+++ b/lisp/ChangeLog	Sat Jul 29 15:05:50 2006 +0000
@@ -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 -r 391851b59b5a -r a17769ba1089 lisp/loadhist.el
--- a/lisp/loadhist.el	Sat Jul 29 12:06:07 2006 +0000
+++ b/lisp/loadhist.el	Sat Jul 29 15:05:50 2006 +0000
@@ -222,8 +222,8 @@
 		  (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