From 4cffefee99809caa82dd85f5d0dd026f3fbf597d Mon Sep 17 00:00:00 2001 From: Lars Hansen Date: Tue, 12 Sep 2006 07:13:52 +0000 Subject: [PATCH] Add comment. --- lisp/ChangeLog | 3 +++ lisp/desktop.el | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) 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 + * desktop.el (desktop-read): Add comment. + 2006-09-12 Kim F. Storm * 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) -- 2.39.2