From: Eli Zaretskii Date: Sun, 27 Mar 2022 05:10:27 +0000 (+0300) Subject: * lisp/desktop.el (desktop-read): Clarify warning text. X-Git-Tag: emacs-28.1~6 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=968af794ba84d90d547de463448de57b7dff3787;p=emacs.git * lisp/desktop.el (desktop-read): Clarify warning text. --- diff --git a/lisp/desktop.el b/lisp/desktop.el index e7a368e21f5..51c56faebb5 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)