summaryrefslogtreecommitdiff
path: root/lisp/gnus/gnus-vm.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/gnus/gnus-vm.el')
-rw-r--r--lisp/gnus/gnus-vm.el16
1 files changed, 9 insertions, 7 deletions
diff --git a/lisp/gnus/gnus-vm.el b/lisp/gnus/gnus-vm.el
index 2420c0b3596..d9abe3e5867 100644
--- a/lisp/gnus/gnus-vm.el
+++ b/lisp/gnus/gnus-vm.el
@@ -1,7 +1,9 @@
;;; gnus-vm.el --- vm interface for Gnus
-;; Copyright (C) 1994,95,96,97,98 Free Software Foundation, Inc.
-;; Author: Per Persson <pp@gnu.org>
+;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000
+;; Free Software Foundation, Inc.
+
+;; Author: Per Persson <pp@gnu.ai.mit.edu>
;; Keywords: news, mail
;; This file is part of GNU Emacs.
@@ -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"))