[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-28 968af794ba: * lisp/desktop.el (desktop-read): Clarify warning t
From: |
Eli Zaretskii |
Subject: |
emacs-28 968af794ba: * lisp/desktop.el (desktop-read): Clarify warning text. |
Date: |
Sun, 27 Mar 2022 01:11:24 -0400 (EDT) |
branch: emacs-28
commit 968af794ba84d90d547de463448de57b7dff3787
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
* lisp/desktop.el (desktop-read): Clarify warning text.
---
lisp/desktop.el | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lisp/desktop.el b/lisp/desktop.el
index e7a368e21f..51c56faebb 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-28 968af794ba: * lisp/desktop.el (desktop-read): Clarify warning text.,
Eli Zaretskii <=