From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Reiner Steib Newsgroups: gmane.emacs.devel Subject: Load of .emacs.desktop from Emacs 21 fails Date: Wed, 12 Oct 2005 00:46:00 +0200 Organization: Dept. of Theoretical Physics, University of Ulm Message-ID: Reply-To: Reiner Steib NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1129071124 8576 80.91.229.2 (11 Oct 2005 22:52:04 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 11 Oct 2005 22:52:04 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Oct 12 00:51:56 2005 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EPSwh-0000zf-UN for ged-emacs-devel@m.gmane.org; Wed, 12 Oct 2005 00:50:08 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EPSwh-0002I1-Da for ged-emacs-devel@m.gmane.org; Tue, 11 Oct 2005 18:50:07 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1EPSwU-0002Hu-EE for emacs-devel@gnu.org; Tue, 11 Oct 2005 18:49:54 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1EPSwS-0002Hh-Tv for emacs-devel@gnu.org; Tue, 11 Oct 2005 18:49:54 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1EPSwS-0002He-Rr for emacs-devel@gnu.org; Tue, 11 Oct 2005 18:49:52 -0400 Original-Received: from [80.91.229.2] (helo=ciao.gmane.org) by monty-python.gnu.org with esmtp (TLS-1.0:RSA_AES_128_CBC_SHA:16) (Exim 4.34) id 1EPSwS-0001St-Kx for emacs-devel@gnu.org; Tue, 11 Oct 2005 18:49:52 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1EPSuk-0000RR-Ef for emacs-devel@gnu.org; Wed, 12 Oct 2005 00:48:06 +0200 Original-Received: from bridgekeeper.physik.uni-ulm.de ([134.60.10.123]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 12 Oct 2005 00:48:06 +0200 Original-Received: from Reiner.Steib by bridgekeeper.physik.uni-ulm.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 12 Oct 2005 00:48:06 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-To: emacs-devel@gnu.org Original-Lines: 49 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: bridgekeeper.physik.uni-ulm.de X-Face: .*T0'iU(sujq_j9\J>-d4fg; N/1++U#U$_5ii6k.=|"-n'?5O:Hyz&wi'-!I~,}7~GgT=0S /&-R5sbkNy5+Xo1y{Tw2KKxi@Xh"g@]Qc|.U<*]WDd)qvGowFDvfU1F]{EDho:7P0@|oOD=Bc{K4?> WP68K[Mx:}=`ZT'6g4'f+g?;`vri2!)xGy}3:=l'(/Cea0l4lo^H5#@/Z3ev Mail-Copies-To: nobody User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) Cancel-Lock: sha1:DIWlI8Gzp4LOriNzcuNBhAXfpzo= X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:43898 Archived-At: 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/