diff options
Diffstat (limited to 'lisp/dired-x.el')
| -rw-r--r-- | lisp/dired-x.el | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/lisp/dired-x.el b/lisp/dired-x.el index 7c0def7f809..3cf6654da2b 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el @@ -1115,6 +1115,7 @@ See `dired-guess-shell-alist-user'." (if (null default) ;; Nothing to guess (read-shell-command prompt nil 'dired-shell-command-history) + (setq prompt (replace-regexp-in-string ": $" " " prompt)) (if (listp default) ;; More than one guess (setq default-list default @@ -1125,7 +1126,7 @@ See `dired-guess-shell-alist-user'." ;; Just one guess (setq default-list (list default))) ;; Put the first guess in the prompt but not in the initial value. - (setq prompt (concat prompt (format "[%s] " default))) + (setq prompt (concat prompt (format "[%s]: " default))) ;; All guesses can be retrieved with M-n (setq val (read-shell-command prompt nil 'dired-shell-command-history @@ -1343,13 +1344,20 @@ Otherwise obeys the value of `dired-vm-read-only-folders'." (rmail (dired-get-filename))) (defun dired-do-run-mail () - "If `dired-bind-vm' is non-nil, call `dired-vm', else call `dired-rmail'." + "Visit the current file as a mailbox, using VM or RMAIL. +Prompt for confirmation first; if the user says yes, call +`dired-vm' if `dired-bind-vm' is non-nil, `dired-rmail' +otherwise." (interactive) - (if dired-bind-vm - ;; Read mail folder using vm. - (dired-vm) - ;; Read mail folder using rmail. - (dired-rmail))) + (let ((file (dired-get-filename t))) + (if dired-bind-vm + (if (y-or-n-p (concat "Visit `" file + "' as a mail folder with VM?")) + (dired-vm)) + ;; Read mail folder using rmail. + (if (y-or-n-p (concat "Visit `" file + "' as a mailbox with RMAIL?")) + (dired-rmail))))) ;;; MISCELLANEOUS INTERNAL FUNCTIONS. |