Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
c99cf5ee
Commit
c99cf5ee
authored
Feb 07, 2014
by
Juri Linkov
Browse files
* lisp/desktop.el (desktop-read): Claim the lock when the owner is not the current process.
Fixes: debbugs:16157
parent
7d7a68d8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/desktop.el
lisp/desktop.el
+1
-1
No files found.
lisp/ChangeLog
View file @
c99cf5ee
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
...
...
lisp/desktop.el
View file @
c99cf5ee
...
...
@@ -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"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment