X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-vm.el;h=c6115823b93d6ea3530538d64992509457232b24;hb=09868cf7efbfa51562d76580eafc9a7b6b0c8d72;hp=6fe4b26445a16e7cd4490131ba43f64f7d51204e;hpb=82300762c3419b73fc2e994b14e3d520fe88b0a9;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-vm.el b/lisp/gnus-vm.el
index 6fe4b26..c611582 100644
--- a/lisp/gnus-vm.el
+++ b/lisp/gnus-vm.el
@@ -36,6 +36,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 +47,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"))