diff options
| author | Jan Djärv | 2010-07-28 19:34:51 +0200 |
|---|---|---|
| committer | Jan Djärv | 2010-07-28 19:34:51 +0200 |
| commit | 8a52f00afa1e1c208268549c22f4c1bdbd79c88e (patch) | |
| tree | d16e053cd220dfb17a7919e83c86fe21f11227c2 /src/xsettings.c | |
| parent | 3f2afe323e27fd54427dd058cc83b0081ddb5212 (diff) | |
| download | emacs-8a52f00afa1e1c208268549c22f4c1bdbd79c88e.tar.gz emacs-8a52f00afa1e1c208268549c22f4c1bdbd79c88e.zip | |
Add tool bar style text-image-horiz (text to the left of the image).
* lisp/cus-start.el (tool-bar-style): Add text-image-horiz.
* src/gtkutil.c (xg_make_tool_item, xg_show_toolbar_item): Handle tool bar
style text_image_horiz.
* src/lisp.h (Qtext_image_horiz): Declare.
* src/xdisp.c (Qtext_image_horiz): Define.
(syms_of_xdisp): Initialize Qtext_image_horiz. Add text-image-horiz
to ducumentation of tool-bar-style.
* src/xsettings.c (Ftool_bar_get_system_style): Also check for
Qtext_image_horiz.
Diffstat (limited to 'src/xsettings.c')
| -rw-r--r-- | src/xsettings.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xsettings.c b/src/xsettings.c index c02c850ac85..0d9c9cadb27 100644 --- a/src/xsettings.c +++ b/src/xsettings.c | |||
| @@ -730,7 +730,8 @@ known style. Otherwise return image. */) | |||
| 730 | if (EQ (Vtool_bar_style, Qimage) | 730 | if (EQ (Vtool_bar_style, Qimage) |
| 731 | || EQ (Vtool_bar_style, Qtext) | 731 | || EQ (Vtool_bar_style, Qtext) |
| 732 | || EQ (Vtool_bar_style, Qboth) | 732 | || EQ (Vtool_bar_style, Qboth) |
| 733 | || EQ (Vtool_bar_style, Qboth_horiz)) | 733 | || EQ (Vtool_bar_style, Qboth_horiz) |
| 734 | || EQ (Vtool_bar_style, Qtext_image_horiz)) | ||
| 734 | return Vtool_bar_style; | 735 | return Vtool_bar_style; |
| 735 | if (!NILP (current_tool_bar_style)) | 736 | if (!NILP (current_tool_bar_style)) |
| 736 | return current_tool_bar_style; | 737 | return current_tool_bar_style; |