Mercurial > hg > xemacs-beta

diff lisp/toolbar.el @ 239:41f2f0e326e9 r20-5b18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-5b18
author cvs
date Mon, 13 Aug 2007 10:15:48 +0200
parents d44af0c54775
children c5d627a313b1
line wrap: on
line diff
--- a/lisp/toolbar.el	Mon Aug 13 10:15:04 2007 +0200
+++ b/lisp/toolbar.el	Mon Aug 13 10:15:48 2007 +0200
@@ -68,6 +68,7 @@
 
 (defun init-toolbar-from-resources (locale)
   (if (and (featurep 'x)
+	   (not (featurep 'infodock))
 	   (or (eq locale 'global)
 	       (eq 'x (device-or-frame-type locale))))
       (x-init-toolbar-from-resources locale)))