From: Gerd Moellmann <gerd@gnu.org>
Date: Wed, 14 Mar 2001 14:00:42 +0000 (+0000)
Subject: (toplevel): Test if `x-toolkit-scroll-bars' is
X-Git-Tag: emacs-pretest-21.0.100~6
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d08947c532ace0bb8f76ecbcf232cba8171d16b3;p=emacs.git

(toplevel): Test if `x-toolkit-scroll-bars' is
bound before using it.  It's not bound when configured without X,
for instance.
---

diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index 5c2a47877a8..4ab77a542e1 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -1,6 +1,7 @@
 ;;; scroll-bar.el --- window system-independent scroll bar support.
 
-;; Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 1999, 2000, 2001
+;;  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: hardware
@@ -330,7 +331,7 @@ EVENT should be a scroll bar click."
 ;;;; Bindings.
 
 ;;; For now, we'll set things up to work like xterm.
-(cond (x-toolkit-scroll-bars
+(cond ((and (boundp 'x-toolkit-scroll-bars) x-toolkit-scroll-bars)
        (global-set-key [vertical-scroll-bar mouse-1]
 		       'scroll-bar-toolkit-scroll))
       (t