summaryrefslogtreecommitdiff
path: root/lisp/loadup.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>1999-07-30 08:48:17 +0000
committerEli Zaretskii <eliz@gnu.org>1999-07-30 08:48:17 +0000
commit449ab6886cf2d629177f9b3abc41141450d59009 (patch)
treeb357c24a699550eec41867ef4341ef2cead8938b /lisp/loadup.el
parent3606b4da9ace3582039071f6212a634b77eb5f49 (diff)
downloademacs-449ab6886cf2d629177f9b3abc41141450d59009.tar.gz
Don't load scroll-bar unless x-toolkit-scroll-bars-p
is bound.
Diffstat (limited to 'lisp/loadup.el')
-rw-r--r--lisp/loadup.el3
1 files changed, 2 insertions, 1 deletions
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))