From: yamaoka <yamaoka>
Date: Mon, 22 Nov 1999 07:10:05 +0000 (+0000)
Subject: (gnus-site-init-file): Undo last change.
X-Git-Tag: t-gnus-6_13_3-02~3
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=232c0a1dae4be56e8dfc8fbd808edffcc23c7af7;p=elisp%2Fgnus.git-

(gnus-site-init-file): Undo last change.
Require `cl' at the top level.
---

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index f2b28fb..856981d 100644
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -25,6 +25,8 @@
 
 ;;; Code:
 
+(require 'cl)
+(eval-when-compile (require 'static))
 (require 'gnus)
 (require 'gnus-win)
 (require 'gnus-int)
@@ -32,9 +34,6 @@
 (require 'gnus-range)
 (require 'gnus-util)
 (require 'message)
-(eval-when-compile
-  (require 'cl)
-  (require 'static))
 
 (defcustom gnus-startup-file (nnheader-concat gnus-home-directory ".newsrc")
   "Your `.newsrc' file.
@@ -49,11 +48,10 @@ If a file with the `.el' or `.elc' suffixes exists, it will be read instead."
   :type 'file)
 
 (defcustom gnus-site-init-file
-  (condition-case nil
-      (concat (file-name-directory
-	       (directory-file-name installation-directory))
-	      "site-lisp/gnus-init")
-    (error nil))
+  (ignore-errors
+    (concat (file-name-directory
+	     (directory-file-name installation-directory))
+	    "site-lisp/gnus-init"))
   "*The site-wide Gnus Emacs-Lisp startup file name, or nil if none.
 If a file with the `.el' or `.elc' suffixes exists, it will be read instead."
   :group 'gnus-start