Mercurial > emacs
comparison src/dispextern.h @ 91015:b83d0dadb2a7
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 857-865)
- Update from CVS
- Merge from emacs--rel--22
- Update from CVS: lisp/emacs-lisp/avl-tree.el: New file.
- Remove RCS keywords
* emacs--rel--22 (patch 97-100)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 246-247)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-252
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 29 Aug 2007 05:03:40 +0000 |
parents | f55f9811f5d7 7db330affbcb |
children | 7e1dd3878c0b |
comparison
equal
deleted
inserted
replaced
91014:2392e6a45952 | 91015:b83d0dadb2a7 |
---|---|
2586 /* Button type. One of nil, `:radio' or `:toggle'. */ | 2586 /* Button type. One of nil, `:radio' or `:toggle'. */ |
2587 TOOL_BAR_ITEM_TYPE, | 2587 TOOL_BAR_ITEM_TYPE, |
2588 | 2588 |
2589 /* Help string. */ | 2589 /* Help string. */ |
2590 TOOL_BAR_ITEM_HELP, | 2590 TOOL_BAR_ITEM_HELP, |
2591 | |
2592 /* Icon file name of right to left image when an RTL locale is used. */ | |
2593 TOOL_BAR_ITEM_RTL_IMAGE, | |
2591 | 2594 |
2592 /* Sentinel = number of slots in tool_bar_items occupied by one | 2595 /* Sentinel = number of slots in tool_bar_items occupied by one |
2593 tool-bar item. */ | 2596 tool-bar item. */ |
2594 TOOL_BAR_ITEM_NSLOTS | 2597 TOOL_BAR_ITEM_NSLOTS |
2595 }; | 2598 }; |