Mercurial > emacs
changeset 98496:44958ed3a501
(x-create-frame-with-faces): Only setup the toolbar if
tool-bar-mode is on.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sat, 04 Oct 2008 01:23:30 +0000 |
| parents | e8a025cdac4a |
| children | 6fa56eeb247c |
| files | lisp/ChangeLog lisp/faces.el |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Oct 04 01:22:26 2008 +0000 +++ b/lisp/ChangeLog Sat Oct 04 01:23:30 2008 +0000 @@ -1,5 +1,8 @@ 2008-10-04 Dan Nicolaescu <dann@ics.uci.edu> + * faces.el (x-create-frame-with-faces): Only setup the toolbar if + tool-bar-mode is on. + * vc-svn.el (vc-svn-dir-status-files): * vc-cvs.el (vc-cvs-dir-status-files): New function.
--- a/lisp/faces.el Sat Oct 04 01:22:26 2008 +0000 +++ b/lisp/faces.el Sat Oct 04 01:23:30 2008 +0000 @@ -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)))