Change prompts when selecting a desktop

This commit is contained in:
Tom Willemse 2013-08-07 15:19:06 +02:00
parent 2fffd8cc37
commit e5122febe8
2 changed files with 9 additions and 6 deletions

2
NEWS
View file

@ -10,3 +10,5 @@
the currently loaded desktop. the currently loaded desktop.
- Add =desktop-registry-rename-desktop= command to rename a desktop. - Add =desktop-registry-rename-desktop= command to rename a desktop.
- Specify prompts for each action that wants a desktop selected.

View file

@ -79,15 +79,16 @@ Returns an empty string when `desktop-dirname' is nil."
(error "No desktop loaded")) (error "No desktop loaded"))
(desktop-registry-add-directory desktop-dirname)) (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." "Ask the user to pick a desktop directory."
(completing-read "Directory: " desktop-registry-registry nil nil (let ((prompt (or prompt "Desktop: ")))
nil 'desktop-registry--history)) (completing-read prompt desktop-registry-registry nil nil nil
'desktop-registry--history)))
;;;###autoload ;;;###autoload
(defun desktop-registry-remove-desktop (desktop) (defun desktop-registry-remove-desktop (desktop)
"Remove DESKTOP from the desktop registry." "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))) (let ((spec (assoc desktop desktop-registry-registry)))
(if spec (if spec
(customize-save-variable (customize-save-variable
@ -98,7 +99,7 @@ Returns an empty string when `desktop-dirname' is nil."
;;;###autoload ;;;###autoload
(defun desktop-registry-rename-desktop (old new) (defun desktop-registry-rename-desktop (old new)
"Rename DESKTOP." "Rename DESKTOP."
(interactive (list (desktop-registry--completing-read) (interactive (list (desktop-registry--completing-read "Rename: ")
(read-string "to: "))) (read-string "to: ")))
(let ((spec (assoc old desktop-registry-registry))) (let ((spec (assoc old desktop-registry-registry)))
(if (not spec) (if (not spec)
@ -110,7 +111,7 @@ Returns an empty string when `desktop-dirname' is nil."
;;;###autoload ;;;###autoload
(defun desktop-registry-change-desktop (name) (defun desktop-registry-change-desktop (name)
"Change to the desktop named 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)))) (desktop-change-dir (cdr (assoc name desktop-registry-registry))))
;;;###autoload ;;;###autoload