Load of .emacs.desktop from Emacs 21 fails

[Reiner Steib]

Hi,

when reading this .emacs.desktop file section...

--8<---------------cut here---------------start------------->8---
;; Buffer section:
(desktop-create-buffer 205
  "/tmp/Online.pl"
  "Online.pl"
  'cperl-mode
  '(auto-fill-mode abbrev-mode nil)
  5558
  '(11044 t)
  nil
  nil
  nil)
--8<---------------cut here---------------end--------------->8---

... (created by Emacs 21.3), I get an error in `desktop-load-file'
because `nil' in the mode list.

The following patch fixed it.  Okay to install?

--8<---------------cut here---------------start------------->8---
--- desktop.el  19 Sep 2005 11:36:25 +0200      1.93
+++ desktop.el  11 Oct 2005 13:19:18 +0200      
@@ -963,10 +963,11 @@
 
 (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, ...;
--8<---------------cut here---------------end--------------->8---

Bye, Reiner.
-- 
       ,,,
      (o o)
---ooO-(_)-Ooo---  |  PGP key available  |  http://rsteib.home.pages.de/