From: David Kastrup Date: Fri, 8 Sep 2006 19:47:27 +0000 (+0000) Subject: (desktop-read): when loading a desktop, disable X-Git-Tag: emacs-pretest-22.0.90~673 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e24f9e5a68aee05113a617072326b17aae203246;p=emacs.git (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'. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8229d0871ce..6c5c97d195a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2006-09-08 David Kastrup + + * desktop.el (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'. + 2006-08-27 Martin Rudalics * window.el (mouse-autoselect-window-timer) @@ -1469,7 +1475,7 @@ repertoire of unit tests. Called just before the provide iff user has customized `allout-run-unit-tests-on-load' non-nil. -2006-07-14 K,Aa(Broly L,Bu(Brentey +2006-07-14 K,Aa(Broly L$,1 q(Brentey * emacs-lisp/authors.el (authors-aliases): Update. @@ -4101,7 +4107,7 @@ Sync with Tramp 2.0.53. * net/tramp.el (tramp-completion-mode): ?\t has event-modifier - 'control. Reported by Matthias F,bv(Brste . + 'control. Reported by Matthias F,Av(Brste . (tramp-completion-file-name-handler): Add autoload cookie for adding to `file-name-handler-alist'. @@ -8695,7 +8701,7 @@ Let term-handle-ansi-terminal-messages override what Bash says about its current directory. -2005-12-16 K,Aa(Broly L,Bu(Brentey +2005-12-16 K,Aa(Broly L$,1 q(Brentey * bindings.el (last-buffer): Move to simple.el. * simple.el (last-buffer): Move here. @@ -10452,7 +10458,7 @@ prompts work for AUTH PLAIN. Also reported by Steve Allan . -2005-12-06 K,Aa(Broly L,Bu(Brentey +2005-12-06 K,Aa(Broly L$,1 q(Brentey * frame.el (set-frame-parameter): Add doc string. @@ -10836,7 +10842,7 @@ (flyspell-post-command-hook): Check input-pending-p while processing the potentially long list of buffer changes. -2005-11-28 K,Aa(Broly L,Bu(Brentey +2005-11-28 K,Aa(Broly L$,1 q(Brentey * buff-menu.el (list-buffers-noselect): Display the selected frame's buffer list, not the global one. 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.