(mail-extr-safe-move-sexp): Make sure this doesn't

[gnu-emacs] / lisp / mail / unrmail.el

diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index ac999a31abde658b5908604b032431b68de14454..05fe04899afe4df90a804bb55a349fddbf09b43c 100644 (file)
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -17,8 +17,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Code:
 
@@ -26,7 +27,7 @@
 
 ;;;###autoload
 (defun batch-unrmail ()
-  "Convert Rmail files to mailbox files.
+  "Convert Rmail files to system inbox format.
 Specify the input Rmail file names as command line arguments.
 For each Rmail file, the corresponding output file name
 is made by adding `.mail' at the end.
@@ -45,15 +46,20 @@ For example, invoke `emacs -batch -f batch-unrmail RMAIL'."
 
 ;;;###autoload
 (defun unrmail (file to-file)
-  "Convert Rmail file FILE to mailbox-format file TO-FILE."
+  "Convert Rmail file FILE to system inbox format file TO-FILE."
   (interactive "fUnrmail (rmail file): \nFUnrmail into (new mailbox file): ")
   (let ((message-count 0)
+       ;; Prevent rmail from making, or switching to, a summary buffer.
+       (rmail-display-summary nil)
        (rmail-delete-after-output nil))
     (rmail file)
+    ;; Default the directory of TO-FILE based on where FILE is.
+    (setq to-file (expand-file-name to-file default-directory))
     (message "Writing messages to %s..." to-file)
     (while (< message-count rmail-total-messages)
       (rmail-show-message
        (setq message-count (1+ message-count)))
+      (rmail-toggle-header)
       (rmail-output to-file 1 t))
     (message "Writing messages to %s...done" to-file)))