diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/desktop.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a86293b6fa2..fd1ad94af29 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 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 to "\\` ". (Bug#16651) 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") |