diff options
| author | Juri Linkov <juri@jurta.org> | 2014-02-07 09:58:10 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2014-02-07 09:58:10 +0200 |
| commit | c99cf5eec16bb8ff6b139e5987389845c9ae2b31 (patch) | |
| tree | 5164b52fbc54e34f2446c52cd17b0af11e53a4a1 /lisp/desktop.el | |
| parent | 7d7a68d860eaf54e81c235952e740a8126c1cff8 (diff) | |
| download | emacs-c99cf5eec16bb8ff6b139e5987389845c9ae2b31.tar.gz | |
* lisp/desktop.el (desktop-read): Claim the lock when the owner is not the current process.
Fixes: debbugs:16157
Diffstat (limited to 'lisp/desktop.el')
| -rw-r--r-- | lisp/desktop.el | 2 |
1 files changed, 1 insertions, 1 deletions
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") |