From: Jan Djärv Date: Wed, 21 Apr 2010 16:25:15 +0000 (+0200) Subject: Document tool-bar-style X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~446 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=20fe03ad8549ef41bcd79a4a0c0d683b1df2318b;p=emacs.git Document tool-bar-style --- diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index a2cc7a08ef6..d2df84e2aae 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2010-04-21 Jan Djärv + + * frames.texi (Tool Bars): Add tool-bar-style. + 2010-04-21 Glenn Morris * ack.texi, emacs.texi (Acknowledgments): Add SELinux support. diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index b4a8500df65..cde901acf75 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi @@ -1262,6 +1262,13 @@ bar uses monochrome icons (PBM or XBM format). You can turn display of tool bars on or off with @kbd{M-x tool-bar-mode} or by customizing the option @code{tool-bar-mode}. +@vindex tool-bar-style +@cindex Tool Bar style + When Emacs is compiled with GTK+ support, tool bars can have text and images. +Customize @code{tool-bar-style} to select style. The default style is +the same as for the desktop in the Gnome case. If no default is found, +the tool bar uses just images. + @node Dialog Boxes @section Using Dialog Boxes @cindex dialog boxes diff --git a/etc/NEWS b/etc/NEWS index 3510b66b616..1b60d61fdd5 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -68,6 +68,10 @@ Algorithm. ** GTK scroll-bars are now placed on the right by default. Use `set-scroll-bar-mode' to change this. +** GTK tool bars can have just text, just images or images and text. +Customize `tool-bar-style´ to choose style. On a Gnome desktop, the default +is taken from the desktop settings. + ** Lucid menus and dialogs can display antialiased fonts if Emacs is built with Xft.