(rmail-secondary-file-menu): Display relative file names.

(rmail-output-menu): Autoload it.
(rmail-mode-map): Add rmail-output-menu and rmail-input-menu.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 0b9b91bfc35f497049b481664304b2695650fb2f..24bc1c2635f457c244339f7b114aa69e32f7018f 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -382,6 +382,12 @@ Note:    it means the file has no messages in it.\n\^_")))
 (define-key rmail-mode-map [menu-bar classify]
   (cons "Classify" (make-sparse-keymap "Classify")))
 
+(define-key rmail-mode-map [menu-bar classify input-menu]
+  '("Input Rmail file (menu)" . rmail-input-menu))
+
+(define-key rmail-mode-map [menu-bar classify output-menu]
+  '("Output (Rmail menu)" . rmail-output-menu))
+
 (define-key rmail-mode-map [menu-bar classify output-inbox]
   '("Output (inbox)" . rmail-output))
 
@@ -661,13 +667,15 @@ Instead, these commands are available:
 
 ;; Choose a .xmail file in dir rmail-secondary-file-directory.
 (defun rmail-secondary-file-menu (event)
-  (let* ((files (directory-files rmail-secondary-file-directory t
+  (let* ((files (directory-files rmail-secondary-file-directory tnil
                                 rmail-secondary-file-regexp))
         (menu (list "Rmail Files"
                     (cons "Rmail Files"
                           (mapcar (function (lambda (f) (cons f f)))
-                                  files)))))
-    (x-popup-menu event menu)))
+                                  files))))
+        (chosen (x-popup-menu event menu)))
+    (if chosen
+       (expand-file-name chosen rmail-secondary-file-directory))))
 
 (defun rmail-input-menu (event)
   "Choose a new Rmail file to edit, with a menu."
@@ -2204,6 +2212,10 @@ buffer visiting that file."
   "Append this message to Unix mail file named FILE-NAME."
   t)
 
+(autoload 'rmail-output-menu "rmailout"
+  "Output current message to another Rmail file, chosen with a menu."
+  t)
+
 ;;;; *** Rmail undigestification ***
 
 (autoload 'undigestify-rmail-message "undigest"