Mercurial > emacs
comparison lisp/loadhist.el @ 90573:858cb33ae39d
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 357-381)
- Merge from gnus--rel--5.10
- Update from CVS
- Merge from erc--emacs--21
* gnus--rel--5.10 (patch 116-122)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-98
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 03 Aug 2006 11:45:23 +0000 |
parents | c156f6a9e7b5 a17769ba1089 |
children | 02cf29720f31 |
comparison
equal
deleted
inserted
replaced
90572:ab9b8d043c39 | 90573:858cb33ae39d |
---|---|
220 (ad-unadvise fun)) | 220 (ad-unadvise fun)) |
221 (let ((aload (get fun 'autoload))) | 221 (let ((aload (get fun 'autoload))) |
222 (if aload | 222 (if aload |
223 (fset fun (cons 'autoload aload)) | 223 (fset fun (cons 'autoload aload)) |
224 (fmakunbound fun)))))) | 224 (fmakunbound fun)))))) |
225 (require nil) | 225 ((t require) nil) |
226 (t (message "Unexpected element %s in load-history" x))) | 226 (t (message "Unexpected element %s in load-history" x))) |
227 ;; Kill local values as much as possible. | 227 ;; Kill local values as much as possible. |
228 (dolist (buf (buffer-list)) | 228 (dolist (buf (buffer-list)) |
229 (with-current-buffer buf | 229 (with-current-buffer buf |
230 (if (and (boundp x) (timerp (symbol-value x))) | 230 (if (and (boundp x) (timerp (symbol-value x))) |
231 (cancel-timer (symbol-value x))) | 231 (cancel-timer (symbol-value x))) |