diff lisp/packages/balloon-help.el @ 209:41ff10fd062f r20-4b3

Import from CVS: tag r20-4b3
author cvs
date Mon, 13 Aug 2007 10:04:58 +0200
parents 489f57a838ef
children
line wrap: on
line diff
--- a/lisp/packages/balloon-help.el	Mon Aug 13 10:03:54 2007 +0200
+++ b/lisp/packages/balloon-help.el	Mon Aug 13 10:04:58 2007 +0200
@@ -494,20 +494,22 @@
 				  frame)
       (set-window-buffer (frame-selected-window frame) balloon-help-buffer)
       (set-specifier has-modeline-p (cons frame nil))
-      (set-specifier top-toolbar-height (cons frame 0))
-      (set-specifier left-toolbar-width (cons frame 0))
-      (set-specifier right-toolbar-width (cons frame 0))
-      (set-specifier bottom-toolbar-height (cons frame 0))
-      (set-specifier top-toolbar-visible-p (cons frame nil))
-      (set-specifier left-toolbar-visible-p (cons frame nil))
-      (set-specifier right-toolbar-visible-p (cons frame nil))
-      (set-specifier bottom-toolbar-visible-p (cons frame nil))
-      (set-specifier top-toolbar (cons frame nil))
-      (set-specifier left-toolbar (cons frame nil))
-      (set-specifier right-toolbar (cons frame nil))
-      (set-specifier bottom-toolbar (cons frame nil))
-      (set-specifier scrollbar-width (cons frame 0))
-      (set-specifier scrollbar-height (cons frame 0))
+      (when (featurep 'toolbar)
+	(set-specifier top-toolbar-height (cons frame 0))
+	(set-specifier left-toolbar-width (cons frame 0))
+	(set-specifier right-toolbar-width (cons frame 0))
+	(set-specifier bottom-toolbar-height (cons frame 0))
+	(set-specifier top-toolbar-visible-p (cons frame nil))
+	(set-specifier left-toolbar-visible-p (cons frame nil))
+	(set-specifier right-toolbar-visible-p (cons frame nil))
+	(set-specifier bottom-toolbar-visible-p (cons frame nil))
+	(set-specifier top-toolbar (cons frame nil))
+	(set-specifier left-toolbar (cons frame nil))
+	(set-specifier right-toolbar (cons frame nil))
+	(set-specifier bottom-toolbar (cons frame nil)))
+      (when (featurep 'scrollbar)
+	(set-specifier scrollbar-width (cons frame 0))
+	(set-specifier scrollbar-height (cons frame 0)))
       (set-specifier text-cursor-visible-p (cons frame nil))
       (set-specifier has-modeline-p (cons frame nil))
       (set-specifier modeline-shadow-thickness (cons frame 0))