mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

(desktop-read): when loading a desktop, disable

Browse source 
saving it while the load progresses, and switch off a pending lazy
load by calling `desktop-lazy-abort'.
This commit is contained in:
David Kastrup 2006-09-08 19:47:27 +00:00
parent 6f6a8bbe81
commit e24f9e5a68
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2006-09-08 David Kastrup <dak@gnu.org>
* 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 <rudalics@gmx.at>
* 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 <lorentey@elte.hu>
2006-07-14 K,Aa(Broly L$,1 q(Brentey <lorentey@elte.hu>
* 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 <slashdevslashnull@gmx.net>.
'control. Reported by Matthias F,Av(Brste <slashdevslashnull@gmx.net>.
(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 <lorentey@elte.hu>
2005-12-16 K,Aa(Broly L$,1 q(Brentey <lorentey@elte.hu>
* 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
<seallan@verizon.net>.
2005-12-06 K,Aa(Broly L,Bu(Brentey <lorentey@elte.hu>
2005-12-06 K,Aa(Broly L$,1 q(Brentey <lorentey@elte.hu>
* 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 <lorentey@elte.hu>
2005-11-28 K,Aa(Broly L$,1 q(Brentey <lorentey@elte.hu>
* buff-menu.el (list-buffers-noselect): Display the selected
frame's buffer list, not the global one.

5
lisp/desktop.el
View file

@ -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.