diff options
| author | Eli Zaretskii | 2022-03-27 08:10:27 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2022-03-27 08:10:27 +0300 |
| commit | 968af794ba84d90d547de463448de57b7dff3787 (patch) | |
| tree | ace5bf0a799ec058955cbe311a9e575a4b9edcdf | |
| parent | 1bef52ce73d61c827677edde60639fd2b8d74d92 (diff) | |
| download | emacs-968af794ba84d90d547de463448de57b7dff3787.tar.gz emacs-968af794ba84d90d547de463448de57b7dff3787.zip | |
* lisp/desktop.el (desktop-read): Clarify warning text.
| -rw-r--r-- | lisp/desktop.el | 6 |
1 files changed, 4 insertions, 2 deletions
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. | |||
| 1266 | (memq desktop-load-locked-desktop '(nil ask)) | 1266 | (memq desktop-load-locked-desktop '(nil ask)) |
| 1267 | (or (null desktop-load-locked-desktop) | 1267 | (or (null desktop-load-locked-desktop) |
| 1268 | (daemonp) | 1268 | (daemonp) |
| 1269 | (not (y-or-n-p (format "Warning: desktop file appears to be in use by PID %s.\n\ | 1269 | (not (y-or-n-p (format " |
| 1270 | Using it may cause conflicts. Use it anyway? " owner))))) | 1270 | Warning: desktop file appears to be in use by process with PID %s.\n\ |
| 1271 | Using it may cause conflicts if that process still runs.\n\ | ||
| 1272 | Use desktop file anyway? " owner))))) | ||
| 1271 | (let ((default-directory desktop-dirname)) | 1273 | (let ((default-directory desktop-dirname)) |
| 1272 | (setq desktop-dirname nil) | 1274 | (setq desktop-dirname nil) |
| 1273 | (run-hooks 'desktop-not-loaded-hook) | 1275 | (run-hooks 'desktop-not-loaded-hook) |