diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/dired-x.el | 19 | ||||
| -rw-r--r-- | lisp/dired.el | 2 |
3 files changed, 19 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3dea3ed0380..6e1fe6d20ce 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-02-09 Chong Yidong <cyd@gnu.org> + + * dired-x.el (dired-do-run-mail): Prompt for confirmation + (Bug#13561). + 2013-02-08 Stefan Monnier <monnier@iro.umontreal.ca> * emacs-lisp/byte-run.el (eval-when-compile, eval-and-compile): diff --git a/lisp/dired-x.el b/lisp/dired-x.el index a2c13033cd1..3cf6654da2b 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el @@ -1344,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. diff --git a/lisp/dired.el b/lisp/dired.el index 30069488586..b5fc46eb78d 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -4297,7 +4297,7 @@ instead. ;;;*** ;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump) -;;;;;; "dired-x" "dired-x.el" "cdaacce7c861256289ba48493dd6d0ec") +;;;;;; "dired-x" "dired-x.el" "90ba5245f6f5df3bdbda6303c725ef45") ;;; Generated autoloads from dired-x.el (autoload 'dired-jump "dired-x" "\ |