diff lisp/utils/floating-toolbar.el @ 209:41ff10fd062f r20-4b3

Import from CVS: tag r20-4b3
author cvs
date Mon, 13 Aug 2007 10:04:58 +0200
parents e45d5e7c476e
children
line wrap: on
line diff
--- a/lisp/utils/floating-toolbar.el	Mon Aug 13 10:03:54 2007 +0200
+++ b/lisp/utils/floating-toolbar.el	Mon Aug 13 10:04:58 2007 +0200
@@ -190,7 +190,8 @@
 		    (specifier-instance left-toolbar-width)
 		  0))
 	       ;; better than nothing
-	       (menubar-height (if current-menubar 22 0)))
+	       (menubar-height (if (and (featurep 'menubar)
+					current-menubar) 22 0)))
 	  (setq x (+ left xleft-toolbar-width (event-x-pixel event))
 		y (+ top xtop-toolbar-height menubar-height
 		     (event-y-pixel event))))