[Emacs-diffs] Changes to emacs/lisp/desktop.el,v

[Lars Hansen]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Lars Hansen <lh>        06/09/12 07:13:17

Index: desktop.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/desktop.el,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- desktop.el  8 Sep 2006 19:47:26 -0000       1.103
+++ desktop.el  12 Sep 2006 07:13:17 -0000      1.104
@@ -863,7 +863,8 @@
       (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)