# HG changeset patch
# User Lars Hansen <larsh@soem.dk>
# Date 1129108615 0
# Node ID 82f31f59347886717e1e07107e06e673e4fd9c5a
# Parent  89bec3b605ff9eb2e18f0fc1b3f207fc9ddce071
*** empty log message ***

diff -r 89bec3b605ff -r 82f31f593478 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Oct 12 09:16:35 2005 +0000
+++ b/lisp/ChangeLog	Wed Oct 12 09:16:55 2005 +0000
@@ -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):