summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/loadhist.el4
2 files changed, 7 insertions, 2 deletions
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