summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemse2013-08-07 15:19:06 +0200
committerGravatar Tom Willemse2013-08-07 15:19:17 +0200
commite5122febe89668170639e9648233811fd8cef3b4 (patch)
treea4a64f2dcf27d0b7bb24640421db5647e9ae48fa
parent2fffd8cc37ac7f506b0add172221a4b86fdc1332 (diff)
downloaddesktop-registry-e5122febe89668170639e9648233811fd8cef3b4.tar.gz
desktop-registry-e5122febe89668170639e9648233811fd8cef3b4.zip
Change prompts when selecting a desktop
-rw-r--r--NEWS2
-rw-r--r--desktop-registry.el13
2 files changed, 9 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 7053a7f..d8e1851 100644
--- a/NEWS
+++ b/NEWS
@@ -10,3 +10,5 @@
the currently loaded desktop.
- Add =desktop-registry-rename-desktop= command to rename a desktop.
+
+ - Specify prompts for each action that wants a desktop selected.
diff --git a/desktop-registry.el b/desktop-registry.el
index c4393b2..a937b0d 100644
--- a/desktop-registry.el
+++ b/desktop-registry.el
@@ -79,15 +79,16 @@ Returns an empty string when `desktop-dirname' is nil."
(error "No desktop loaded"))
(desktop-registry-add-directory desktop-dirname))
-(defun desktop-registry--completing-read ()
+(defun desktop-registry--completing-read (&optional prompt)
"Ask the user to pick a desktop directory."
- (completing-read "Directory: " desktop-registry-registry nil nil
- nil 'desktop-registry--history))
+ (let ((prompt (or prompt "Desktop: ")))
+ (completing-read prompt desktop-registry-registry nil nil nil
+ 'desktop-registry--history)))
;;;###autoload
(defun desktop-registry-remove-desktop (desktop)
"Remove DESKTOP from the desktop registry."
- (interactive (list (desktop-registry--completing-read)))
+ (interactive (list (desktop-registry--completing-read "Remove: ")))
(let ((spec (assoc desktop desktop-registry-registry)))
(if spec
(customize-save-variable
@@ -98,7 +99,7 @@ Returns an empty string when `desktop-dirname' is nil."
;;;###autoload
(defun desktop-registry-rename-desktop (old new)
"Rename DESKTOP."
- (interactive (list (desktop-registry--completing-read)
+ (interactive (list (desktop-registry--completing-read "Rename: ")
(read-string "to: ")))
(let ((spec (assoc old desktop-registry-registry)))
(if (not spec)
@@ -110,7 +111,7 @@ Returns an empty string when `desktop-dirname' is nil."
;;;###autoload
(defun desktop-registry-change-desktop (name)
"Change to the desktop named NAME."
- (interactive (list (desktop-registry--completing-read)))
+ (interactive (list (desktop-registry--completing-read "Switch to: ")))
(desktop-change-dir (cdr (assoc name desktop-registry-registry))))
;;;###autoload