From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 30 Jul 1999 08:48:17 +0000 (+0000)
Subject: Don't load scroll-bar unless x-toolkit-scroll-bars-p
X-Git-Tag: emacs-pretest-21.0.90~7320
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=449ab6886cf2d629177f9b3abc41141450d59009;p=emacs.git

Don't load scroll-bar unless x-toolkit-scroll-bars-p
is bound.
---

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 06942f25bfd..86122146a6e 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -102,7 +102,8 @@
 (if (fboundp 'track-mouse)
     (progn
       (load "mouse")
-      (load "scroll-bar")
+      (and (boundp 'x-toolkit-scroll-bars-p)
+	   (load "scroll-bar"))
       (load "select")))
 
 (message "%s" (garbage-collect))