aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJan Djärv2010-07-28 19:34:51 +0200
committerJan Djärv2010-07-28 19:34:51 +0200
commit8a52f00afa1e1c208268549c22f4c1bdbd79c88e (patch)
treed16e053cd220dfb17a7919e83c86fe21f11227c2 /lisp
parent3f2afe323e27fd54427dd058cc83b0081ddb5212 (diff)
downloademacs-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 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/cus-start.el1
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 @@
12010-07-28 Jan Djärv <jan.h.d@swipnet.se>
2
3 * cus-start.el (tool-bar-style): Add text-image-horiz.
4
12010-07-28 Michael Albinus <michael.albinus@gmx.de> 52010-07-28 Michael Albinus <michael.albinus@gmx.de>
2 6
3 * progmodes/gud.el (gud-common-init): Check for remoteness of 7 * 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."
345 (const :tag "Text" :value text) 345 (const :tag "Text" :value text)
346 (const :tag "Both" :value both) 346 (const :tag "Both" :value both)
347 (const :tag "Both-horiz" :value both-horiz) 347 (const :tag "Both-horiz" :value both-horiz)
348 (const :tag "Text-image-horiz" :value text-image-horiz)
348 (const :tag "System default" :value nil)) "23.3") 349 (const :tag "System default" :value nil)) "23.3")
349 (tool-bar-max-label-size frames integer "23.3") 350 (tool-bar-max-label-size frames integer "23.3")
350 351