From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 7 Dec 2020 17:53:55 +0000 (+0100)
Subject: Avoid problems when calling desktop-read twice
X-Git-Tag: emacs-28.0.90~4870
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0c330bed24ef045732a1bfe61d20ed8328dd0b28;p=emacs.git

Avoid problems when calling desktop-read twice

* lisp/desktop.el (desktop-read): Don't reload the desktop file if
it's already been loaded, because the later query may lead to
desktop-dirname being set to nil (bug#9765).
---

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 7a7f1d07c93..4be330375da 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1222,7 +1222,13 @@ This function is a no-op when Emacs is running in batch mode.
 It returns t if a desktop file was loaded, nil otherwise.
 \n(fn DIRNAME)"
   (interactive "i\nP")
-  (unless noninteractive
+  (if (or noninteractive
+          (and (desktop-owner)
+               (= (desktop-owner) (emacs-pid))))
+      (message "Not reloading the desktop%s"
+               (if noninteractive
+                   ""
+                 "; already loaded"))
     (setq desktop-dirname
           (file-name-as-directory
            (expand-file-name