Require cl at compile time.

(gnus-site-init-file): Use condition-case.

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index be0017e7f032aec65e0f9c2e54a1343bec58185b..0520c2f59e9c9076690434e82f75d5d137bd5b30 100644 (file)
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -32,6 +32,7 @@
 (require 'gnus-range)
 (require 'gnus-util)
 (require 'message)
+(eval-when-compile (require 'cl))
 
 (defcustom gnus-startup-file (nnheader-concat gnus-home-directory ".newsrc")
   "Your `.newsrc' file.
@@ -47,10 +48,11 @@ instead."
   :type 'file)
 
 (defcustom gnus-site-init-file
-  (ignore-errors
+  (condition-case nil
     (concat (file-name-directory
             (directory-file-name installation-directory))
-           "site-lisp/gnus-init"))
+           "site-lisp/gnus-init")
+    (error nil))
   "The site-wide Gnus elisp startup file.
 If a file with the .el or .elc suffixes exist, it will be read
 instead."