*** empty log message ***

[gnus] / lisp / gnus-vm.el

diff --git a/lisp/gnus-vm.el b/lisp/gnus-vm.el
index d102d7f..32bb160 100644 (file)
--- a/lisp/gnus-vm.el
+++ b/lisp/gnus-vm.el
@@ -1,5 +1,5 @@
 ;;; gnus-vm.el --- vm interface for Gnus
-;; Copyright (C) 1994,95,96 Free Software Foundation, Inc.
+;; Copyright (C) 1994,95,96,97 Free Software Foundation, Inc.
 
 ;; Author: Per Persson <pp@gnu.ai.mit.edu>
 ;; Keywords: news, mail
@@ -23,9 +23,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,7 +34,6 @@
 (require 'message)
 (require 'gnus)
 (require 'gnus-msg)
-(require 'gnus-load)
 
 (eval-when-compile
   (autoload 'vm-mode "vm")
@@ -49,12 +48,12 @@ Has to be set before gnus-vm is loaded.")
 
 (or gnus-vm-inhibit-window-system
     (condition-case nil
-       (if window-system
-           (require 'win-vm))
+       (when window-system
+         (require 'win-vm))
       (error nil)))
 
-(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 +74,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.
@@ -94,9 +93,9 @@ save those articles instead."
     (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)
+               (t (gnus-read-save-file-name
+                   "Save %s in VM folder:" default-name))))
+    (gnus-make-directory (file-name-directory folder))
     (set-buffer gnus-original-article-buffer)
     (save-excursion
       (save-restriction