From e24f9e5a68aee05113a617072326b17aae203246 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Fri, 8 Sep 2006 19:47:27 +0000 Subject: (desktop-read): when loading a desktop, disable saving it while the load progresses, and switch off a pending lazy load by calling `desktop-lazy-abort'. --- lisp/desktop.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lisp/desktop.el') diff --git a/lisp/desktop.el b/lisp/desktop.el index fe5a278bae8..e81648b0b3c 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -862,8 +862,9 @@ It returns t if a desktop file was loaded, nil otherwise." ;; Desktop file found, process it. (let ((desktop-first-buffer nil) (desktop-buffer-ok-count 0) - (desktop-buffer-fail-count 0)) - (setq desktop-lazy-timer nil) + (desktop-buffer-fail-count 0) + desktop-save) + (desktop-lazy-abort) ;; Evaluate desktop buffer. (load (desktop-full-file-name) t t t) ;; `desktop-create-buffer' puts buffers at end of the buffer list. -- cgit v1.2.1