Mercurial > emacs
diff lisp/desktop.el @ 90286:5b7d410e31f9
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-7
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 4-14)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (base, patch 1-7)
- tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
- Update from CVS
- Merge from emacs--devo--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10 (patch 187)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 25 Jan 2006 07:10:04 +0000 |
parents | 7beb78bc1f8e ffdb60daf52a |
children | c5406394f567 |
line wrap: on
line diff
--- a/lisp/desktop.el Tue Jan 24 02:01:42 2006 +0000 +++ b/lisp/desktop.el Wed Jan 25 07:10:04 2006 +0000 @@ -966,7 +966,7 @@ (defun desktop-load-file (function) "Load the file where auto loaded FUNCTION is defined." (when function - (let ((fcell (symbol-function function))) + (let ((fcell (and (fboundp function) (symbol-function function)))) (when (and (listp fcell) (eq 'autoload (car fcell))) (load (cadr fcell))))))