diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2010-07-28 19:34:51 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2010-07-28 19:34:51 +0200 |
| commit | 8a52f00afa1e1c208268549c22f4c1bdbd79c88e (patch) | |
| tree | d16e053cd220dfb17a7919e83c86fe21f11227c2 /lisp | |
| parent | 3f2afe323e27fd54427dd058cc83b0081ddb5212 (diff) | |
| download | emacs-8a52f00afa1e1c208268549c22f4c1bdbd79c88e.tar.gz | |
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 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/cus-start.el | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7f3fc15e753..ee80f9a718f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-07-28 Jan Djärv <jan.h.d@swipnet.se> + + * cus-start.el (tool-bar-style): Add text-image-horiz. + 2010-07-28 Michael Albinus <michael.albinus@gmx.de> * progmodes/gud.el (gud-common-init): Check for remoteness of diff --git a/lisp/cus-start.el b/lisp/cus-start.el index bc48aa88cc5..4778cf611e5 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -345,6 +345,7 @@ since it could result in memory overflow and make Emacs crash." (const :tag "Text" :value text) (const :tag "Both" :value both) (const :tag "Both-horiz" :value both-horiz) + (const :tag "Text-image-horiz" :value text-image-horiz) (const :tag "System default" :value nil)) "23.3") (tool-bar-max-label-size frames integer "23.3") |