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

	for load-history elements.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf2b61f37566268b5aa07047b597f25b7d69e912..6ee708c4392c2fb2e2701d2d8bb0a4b7ef7058a1 100644 (file)
--- 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 635059f93e534b467f31bc99628ea6249c2a41c5..61f15c8ef1c067d4d7a9338cfc6099ffd34e3d0f 100644 (file)
--- 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