diff options
| author | David Kastrup <dak@gnu.org> | 2006-09-08 19:47:27 +0000 |
|---|---|---|
| committer | David Kastrup <dak@gnu.org> | 2006-09-08 19:47:27 +0000 |
| commit | e24f9e5a68aee05113a617072326b17aae203246 (patch) | |
| tree | 1617a687ffcccb5b105c1c678108233031b8652c /lisp/desktop.el | |
| parent | 6f6a8bbe81f878b67d806fe6a88c70a9a24dd484 (diff) | |
| download | emacs-e24f9e5a68aee05113a617072326b17aae203246.tar.gz | |
(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'.
Diffstat (limited to 'lisp/desktop.el')
| -rw-r--r-- | lisp/desktop.el | 5 |
1 files changed, 3 insertions, 2 deletions
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. |