* nnmail.el (nnmail-cache-insert): make sure that the

[gnus] / lisp / gnus-vm.el

diff --git a/lisp/gnus-vm.el b/lisp/gnus-vm.el
index 8e83dbe..a4f5e65 100644 (file)
--- a/lisp/gnus-vm.el
+++ b/lisp/gnus-vm.el
@@ -1,5 +1,7 @@
 ;;; gnus-vm.el --- vm interface for Gnus
-;; Copyright (C) 1994,95,96,97 Free Software Foundation, Inc.
+
+;; 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
@@ -36,6 +38,7 @@
 (require 'gnus-msg)
 
 (eval-when-compile
+  (require 'cl)
   (autoload 'vm-mode "vm")
   (autoload 'vm-save-message "vm")
   (autoload 'vm-forward-message "vm")
@@ -46,11 +49,10 @@
   "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
-       (when window-system
-         (require 'win-vm))
-      (error nil)))
+(unless gnus-vm-inhibit-window-system
+  (ignore-errors
+    (when window-system
+      (require 'win-vm))))
 
 (when (not (featurep 'vm))
   (load "vm"))
@@ -82,18 +84,17 @@ 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)
   (setq folder
-       (cond ((eq folder 'default) default-name)
-             (folder folder)
-             (t (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-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
@@ -104,4 +105,4 @@ save those articles instead."
 
 (provide 'gnus-vm)
 
-;;; gnus-vm.el ends here.
+;;; gnus-vm.el ends here