* gnus-util.el (gnus-parse-without-error): Add edebug-form-spec.

[gnus] / lisp / gnus-vm.el

diff --git a/lisp/gnus-vm.el b/lisp/gnus-vm.el
index cd0a7d9..a4f5e65 100644 (file)
--- a/lisp/gnus-vm.el
+++ b/lisp/gnus-vm.el
@@ -1,7 +1,9 @@
 ;;; gnus-vm.el --- vm interface for Gnus
-;; Copyright (C) 1994,95,96 Free Software Foundation, Inc.
 
-;; Author: Per Persson <pp@solace.mh.se>
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+;;     Free Software Foundation, Inc.
+
+;; Author: Per Persson <pp@gnu.ai.mit.edu>
 ;; Keywords: news, mail
 
 ;; This file is part of GNU Emacs.
@@ -23,9 +25,9 @@
 
 ;;; Commentary:
 
-;; Major contributors: 
+;; Major contributors:
 ;;     Christian Limpach <Christian.Limpach@nice.ch>
-;; Some code stolen from: 
+;; Some code stolen from:
 ;;     Rick Sladkey <jrs@world.std.com>
 
 ;;; Code:
@@ -34,9 +36,9 @@
 (require 'message)
 (require 'gnus)
 (require 'gnus-msg)
-(require 'gnus-load)
 
 (eval-when-compile
+  (require 'cl)
   (autoload 'vm-mode "vm")
   (autoload 'vm-save-message "vm")
   (autoload 'vm-forward-message "vm")
@@ -47,14 +49,13 @@
   "Inhibit loading `win-vm' if using a window-system.
 Has to be set before gnus-vm is loaded.")
 
-(or gnus-vm-inhibit-window-system
-    (condition-case nil
-       (if window-system
-           (require 'win-vm))
-      (error nil)))
+(unless gnus-vm-inhibit-window-system
+  (ignore-errors
+    (when window-system
+      (require 'win-vm))))
 
-(if (not (featurep 'vm))
-    (load "vm"))
+(when (not (featurep 'vm))
+  (load "vm"))
 
 (defun gnus-vm-make-folder (&optional buffer)
   (let ((article (or buffer (current-buffer)))
@@ -75,7 +76,7 @@ Has to be set before gnus-vm is loaded.")
     (insert "\n")
     (vm-mode)
     tmp-folder))
-  
+
 (defun gnus-summary-save-article-vm (&optional arg)
   "Append the current article to a vm folder.
 If N is a positive number, save the N next articles.
@@ -83,30 +84,25 @@ If N is a negative number, save the N previous articles.
 If N is nil and any articles have been marked with the process mark,
 save those articles instead."
   (interactive "P")
+  (require 'gnus-art)
   (let ((gnus-default-article-saver 'gnus-summary-save-in-vm))
     (gnus-summary-save-article arg)))
 
 (defun gnus-summary-save-in-vm (&optional folder)
   (interactive)
-  (let ((default-name
-         (funcall gnus-mail-save-name gnus-newsgroup-name
-                  gnus-current-headers gnus-newsgroup-last-mail)))
-    (setq folder
-         (cond ((eq folder 'default) default-name)
-               (folder folder)
-               (t (gnus-read-save-file-name 
-                   "Save article in VM folder:" default-name))))
-    (make-directory (file-name-directory folder) t)
-    (set-buffer gnus-original-article-buffer)
+  (setq folder
+       (gnus-read-save-file-name
+        "Save %s in VM folder:" folder
+        gnus-mail-save-name gnus-newsgroup-name
+        gnus-current-headers 'gnus-newsgroup-last-mail))
+  (gnus-eval-in-buffer-window gnus-original-article-buffer
     (save-excursion
       (save-restriction
        (widen)
        (let ((vm-folder (gnus-vm-make-folder)))
          (vm-save-message folder)
-         (kill-buffer vm-folder))))
-    ;; Remember the directory name to save articles.
-    (setq gnus-newsgroup-last-mail folder)))
+         (kill-buffer vm-folder))))))
 
 (provide 'gnus-vm)
 
-;;; gnus-vm.el ends here.
+;;; gnus-vm.el ends here