From: Glenn Morris <rgm@gnu.org>
Date: Wed, 11 Jun 2008 03:12:15 +0000 (+0000)
Subject: (gnus-x-splash): Check tool-bar-mode is bound.
X-Git-Tag: emacs-pretest-23.0.90~4882
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1e957e643e776714db0a3ae754d22558a6412ead;p=emacs.git

(gnus-x-splash): Check tool-bar-mode is bound.
Remove unnecessary eval-and-compile of autoloads.
---

diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index ef557c7627a..97e209c18c0 100644
--- a/lisp/gnus/gnus-ems.el
+++ b/lisp/gnus/gnus-ems.el
@@ -42,10 +42,10 @@
 
 (eval-and-compile
   (autoload 'gnus-xmas-define "gnus-xmas")
-  (autoload 'gnus-xmas-redefine "gnus-xmas")
-  (autoload 'gnus-get-buffer-create "gnus")
-  (autoload 'nnheader-find-etc-directory "nnheader"))
+  (autoload 'gnus-xmas-redefine "gnus-xmas"))
 
+(autoload 'gnus-get-buffer-create "gnus")
+(autoload 'nnheader-find-etc-directory "nnheader")
 (autoload 'smiley-region "smiley")
 
 (defun gnus-kill-all-overlays ()
@@ -214,7 +214,8 @@
 		    (car sbars)
 		    (/ (or (car fringes) 0) fcw))
 	    yoffset (cadr (window-edges))
-	    top (max 0 (- (* (max (if (and tool-bar-mode
+	    top (max 0 (- (* (max (if (and (boundp 'tool-bar-mode)
+					   tool-bar-mode
 					   (not (featurep 'gtk))
 					   (eq (frame-first-window)
 					       (selected-window)))