X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-vm.el;h=5aa1ece2b0c2160a3e6a7a7a10ea2db5bac73899;hb=b83f8075b710368442538ef872ed3f6b5400698a;hp=2684ecc8c0e1e9fa50083fb8adc54d4b86451920;hpb=9a8731d6dea8021a10dec1b42f382609336a9aa9;p=gnus

diff --git a/lisp/gnus-vm.el b/lisp/gnus-vm.el
index 2684ecc8c..5aa1ece2b 100644
--- a/lisp/gnus-vm.el
+++ b/lisp/gnus-vm.el
@@ -1,7 +1,6 @@
 ;;; gnus-vm.el --- vm interface for Gnus
 
-;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2016 Free Software Foundation, Inc.
 
 ;; Author: Per Persson <pp@gnu.ai.mit.edu>
 ;; Keywords: news, mail
@@ -36,12 +35,10 @@
 (require 'gnus-msg)
 
 (eval-when-compile
-  (require 'cl)
-  (autoload 'vm-mode "vm")
-  (autoload 'vm-save-message "vm")
-  (autoload 'vm-forward-message "vm")
-  (autoload 'vm-reply "vm")
-  (autoload 'vm-mail "vm"))
+  (require 'cl))
+
+(autoload 'vm-mode "vm")
+(autoload 'vm-save-message "vm")
 
 (defvar gnus-vm-inhibit-window-system nil
   "Inhibit loading `win-vm' if using a window-system.
@@ -52,10 +49,8 @@ Has to be set before gnus-vm is loaded.")
     (when window-system
       (require 'win-vm))))
 
-(when (not (featurep 'vm))
-  (load "vm"))
-
 (defun gnus-vm-make-folder (&optional buffer)
+  (require 'vm)
   (let ((article (or buffer (current-buffer)))
 	(tmp-folder (generate-new-buffer " *tmp-folder*"))
 	(start (point-min))
@@ -88,6 +83,7 @@ save those articles instead."
 
 (defun gnus-summary-save-in-vm (&optional folder)
   (interactive)
+  (require 'vm)
   (setq folder
 	(gnus-read-save-file-name
 	 "Save %s in VM folder:" folder
@@ -103,5 +99,4 @@ save those articles instead."
 
 (provide 'gnus-vm)
 
-;; arch-tag: 42ca7f88-a12f-461d-be3e-cac7efb44866
 ;;; gnus-vm.el ends here