procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/desktop.el (desktop-read): Clarify warning text.

Browse source
This commit is contained in:
Eli Zaretskii 2022-03-27 08:10:27 +03:00
parent 1bef52ce73
commit 968af794ba
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/desktop.el
View file

@ -1266,8 +1266,10 @@ It returns t if a desktop file was loaded, nil otherwise.
(memq desktop-load-locked-desktop '(nil ask))
(or (null desktop-load-locked-desktop)
(daemonp)
(not (y-or-n-p (format "Warning: desktop file appears to be in use by PID %s.\n\
Using it may cause conflicts. Use it anyway? " owner)))))
(not (y-or-n-p (format "
Warning: desktop file appears to be in use by process with PID %s.\n\
Using it may cause conflicts if that process still runs.\n\
Use desktop file anyway? " owner)))))
(let ((default-directory desktop-dirname))
(setq desktop-dirname nil)
(run-hooks 'desktop-not-loaded-hook)