From: Juri Linkov Date: Fri, 7 Feb 2014 07:58:10 +0000 (+0200) Subject: * lisp/desktop.el (desktop-read): Claim the lock when the owner is not the current... X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~132 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c99cf5eec16bb8ff6b139e5987389845c9ae2b31;p=emacs.git * lisp/desktop.el (desktop-read): Claim the lock when the owner is not the current process. Fixes: debbugs:16157 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a86293b6fa2..fd1ad94af29 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-02-07 Juri Linkov + + * desktop.el (desktop-read): Claim the lock when the owner is not + the current process. (Bug#16157) + 2014-02-07 Juri Linkov * desktop.el (desktop-buffers-not-to-save): Change default from nil diff --git a/lisp/desktop.el b/lisp/desktop.el index be348b60a99..3380e39445b 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -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")