diff options
Diffstat (limited to 'lisp/desktop.el')
| -rw-r--r-- | lisp/desktop.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el index fe5a278bae8..d2b2271d306 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -862,8 +862,10 @@ 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) + ;; 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) ;; `desktop-create-buffer' puts buffers at end of the buffer list. |