2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e70988b6ffe..6e05003e095 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,6 @@
+2006-09-12 Lars Hansen <larsh@soem.dk>
+        * desktop.el (desktop-read): Add comment.
+
 2006-09-12  Kim F. Storm  <storm@cua.dk>
 
         * simple.el (next-error-highlight, next-error-highlight-no-select):
diff --git a/lisp/desktop.el b/lisp/desktop.el
index e81648b0b3c..d2b2271d306 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -863,7 +863,8 @@ It returns t if a desktop file was loaded, nil otherwise."
       (let ((desktop-first-buffer nil)
             (desktop-buffer-ok-count 0)
             (desktop-buffer-fail-count 0)
-            desktop-save)
+            ;; Avoid desktop saving during evaluation of desktop buffer.
+            (desktop-save nil))
         (desktop-lazy-abort)
         ;; Evaluate desktop buffer.
         (load (desktop-full-file-name) t t t)