Commit c99cf5ee authored by Juri Linkov's avatar Juri Linkov

* lisp/desktop.el (desktop-read): Claim the lock when the owner is not the current process.

Fixes: debbugs:16157
parent 7d7a68d8
2014-02-07 Juri Linkov <juri@jurta.org>
* desktop.el (desktop-read): Claim the lock when the owner is not
the current process. (Bug#16157)
2014-02-07 Juri Linkov <juri@jurta.org>
* desktop.el (desktop-buffers-not-to-save): Change default from nil
......
......@@ -1108,7 +1108,7 @@ Using it may cause conflicts. Use it anyway? " owner)))))
(setq desktop-file-modtime (nth 5 (file-attributes (desktop-full-file-name))))
;; If it wasn't already, mark it as in-use, to bother other
;; desktop instances.
(unless owner
(unless (eq (emacs-pid) owner)
(condition-case nil
(desktop-claim-lock)
(file-error (message "Couldn't record use of desktop file")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment