[Emacs-diffs] Changes to emacs/lisp/faces.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/10/04 01:23:34

Index: faces.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/faces.el,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -b -r1.426 -r1.427
--- faces.el    2 Oct 2008 20:19:24 -0000       1.426
+++ faces.el    4 Oct 2008 01:23:34 -0000       1.427
@@ -2007,7 +2007,8 @@
          ;; Make sure the tool-bar is ready to be enabled.  The
          ;; `tool-bar-lines' frame parameter will not take effect
          ;; without this call.
-         (tool-bar-setup frame)
+         (when tool-bar-mode
+           (tool-bar-setup frame))
          (if (null visibility-spec)
              (make-frame-visible frame)
            (modify-frame-parameters frame (list visibility-spec)))