(desktop-load-file): Do nothing when FUNCTION is nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1de2034918dd472f5fb236fa50c9a7fd6b1b464b..82189b2d492b3bdc5bc56849fef7b0cc14a6768c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-12  Lars Hansen  <larsh@soem.dk>
+
+       * desktop.el (desktop-load-file): Do nothing when FUNCTION is nil.
+       Reported by Reiner Steib <Reiner.Steib@gmx.de>.
+
 2005-10-11  Sven Joachim  <svenjoac@gmx.de>
 
        * progmodes/sh-script.el (sh-tmp-file):

diff --git a/lisp/desktop.el b/lisp/desktop.el
index cf4d387c7b19589cf981fa8dac3841a10eaefc13..0d5d18da1918c58646fc235d2fda98a171d74f77 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -963,10 +963,11 @@ directory DIRNAME."
 
 (defun desktop-load-file (function)
   "Load the file where auto loaded FUNCTION is defined."
-  (let ((fcell (symbol-function function)))
-    (when (and (listp fcell)
-               (eq 'autoload (car fcell)))
-      (load (cadr fcell)))))
+  (when function
+    (let ((fcell (symbol-function function)))
+      (when (and (listp fcell)
+                 (eq 'autoload (car fcell)))
+        (load (cadr fcell))))))
 
 ;; ----------------------------------------------------------------------------
 ;; Create a buffer, load its file, set its mode, ...;