[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 13a15a3: * lisp/desktop.el (desktop-read): With arg
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] master 13a15a3: * lisp/desktop.el (desktop-read): With argument, ask the user for DIRNAME. |
Date: |
Thu, 26 Sep 2019 06:18:11 -0400 (EDT) |
branch: master
commit 13a15a3a5a123e0e3377f41974ce12af69c8d5e0
Author: Juanma Barranquero <address@hidden>
Commit: Juanma Barranquero <address@hidden>
* lisp/desktop.el (desktop-read): With argument, ask the user for DIRNAME.
* etc/NEWS: Document it.
---
etc/NEWS | 5 +++++
lisp/desktop.el | 11 +++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index 9a0b633..79e9655 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -542,6 +542,11 @@ network connection information (in addition to the host
name).
** The 'cl' package is now officially deprecated in favor of 'cl-lib'.
+---
+** desktop
+*** When called interactively with a prefix arg 'C-u', 'desktop-read'
+now prompts the user for the directory containing the desktop file.
+
+++
** winner
*** A new variable, 'winner-boring-buffers-regexp', has been added.
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 59610a1..498f769 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1191,17 +1191,18 @@ being set (usually, by reading it from the desktop)."
(defvar desktop-buffer-ok-count)
(defvar desktop-buffer-fail-count)
-;; FIXME Interactively, this should have the option to prompt for dirname.
;;;###autoload
-(defun desktop-read (&optional dirname)
+(defun desktop-read (&optional dirname ask)
"Read and process the desktop file in directory DIRNAME.
Look for a desktop file in DIRNAME, or if DIRNAME is omitted, look in
directories listed in `desktop-path'. If a desktop file is found, it
is processed and `desktop-after-read-hook' is run. If no desktop file
is found, clear the desktop and run `desktop-no-desktop-file-hook'.
+Interactively, with prefix arg \\[universal-argument], ask for DIRNAME.
This function is a no-op when Emacs is running in batch mode.
-It returns t if a desktop file was loaded, nil otherwise."
- (interactive)
+It returns t if a desktop file was loaded, nil otherwise.
+\n(fn DIRNAME)"
+ (interactive "i\nP")
(unless noninteractive
(setq desktop-dirname
(file-name-as-directory
@@ -1209,6 +1210,8 @@ It returns t if a desktop file was loaded, nil otherwise."
(or
;; If DIRNAME is specified, use it.
(and (< 0 (length dirname)) dirname)
+ ;; Else, with a prefix arg, ask for a directory name.
+ (and ask (read-directory-name "Directory for desktop file: " nil
nil t))
;; Otherwise search desktop file in desktop-path.
(let ((dirs desktop-path))
(while (and dirs
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 13a15a3: * lisp/desktop.el (desktop-read): With argument, ask the user for DIRNAME.,
Juanma Barranquero <=