summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2001-03-14 14:00:42 +0000
committerGerd Moellmann <gerd@gnu.org>2001-03-14 14:00:42 +0000
commitd08947c532ace0bb8f76ecbcf232cba8171d16b3 (patch)
tree8c7c9e2f99e2b0a39d91434543a73b02d97973eb
parent6500871233814363a1645a0bf411cd2fb0832580 (diff)
downloademacs-d08947c532ace0bb8f76ecbcf232cba8171d16b3.tar.gz
(toplevel): Test if `x-toolkit-scroll-bars' is
bound before using it. It's not bound when configured without X, for instance.
-rw-r--r--lisp/scroll-bar.el5
1 files changed, 3 insertions, 2 deletions
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