gnus-vm.el: Make it loadable without VM

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4b3b8bb..9df871a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-11  Glenn Morris  <rgm@gnu.org>
+
+       * gnus-vm.el: Make it loadable without VM.
+       (gnus-vm-make-folder, gnus-summary-save-in-vm): Require 'vm.
+       (vm-forward-message, vm-reply, vm-mail): Remove unused autoloads.
+
 2013-05-09  Glenn Morris  <rgm@gnu.org>
 
        * mml1991.el: Make it loadable.  (Bug#13456)

diff --git a/lisp/gnus-vm.el b/lisp/gnus-vm.el
index fa39bae..55f9965 100644 (file)
--- a/lisp/gnus-vm.el
+++ b/lisp/gnus-vm.el
@@ -35,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.
@@ -51,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))
@@ -87,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