[Emacs-diffs] trunk r116304: * lisp/desktop.el (desktop-read): Claim the lock when the owner is not the current process.

[Juri Linkov]

------------------------------------------------------------
revno: 116304
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16157
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Fri 2014-02-07 09:58:10 +0200
message:
  * lisp/desktop.el (desktop-read): Claim the lock when the owner is not the 
current process.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/desktop.el                desktop.el-20091113204419-o5vbwnq5f7feedwu-591

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-07 07:51:56 +0000
+++ b/lisp/ChangeLog    2014-02-07 07:58:10 +0000
@@ -1,5 +1,10 @@
 2014-02-07  Juri Linkov  <address@hidden>
 
+       * desktop.el (desktop-read): Claim the lock when the owner is not
+       the current process.  (Bug#16157)
+
+2014-02-07  Juri Linkov  <address@hidden>
+
        * desktop.el (desktop-buffers-not-to-save): Change default from nil
        to "\\` ".  (Bug#16651)
 

=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el   2014-02-07 07:51:56 +0000
+++ b/lisp/desktop.el   2014-02-07 07:58:10 +0000
@@ -1108,7 +1108,7 @@
            (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")