Mercurial > emacs
comparison lisp/info.el @ 111998:bc8dc4ac1e28
Implement tool-bar separators for non-GTK tool-bars.
* lisp/tool-bar.el (tool-bar--image-expression): New function.
(tool-bar-local-item, tool-bar--image-exp): Use it.
(tool-bar-setup): Initialize tool-bar-separator-image-expression.
Use :enable instead of :visible to avoid changing the tool-bar
configuration unnecessarily.
* src/keyboard.c (Vtool_bar_separator_image_expression): New variable.
(parse_tool_bar_item): Use it to obtain image separators for
displays not using native tool-bar separators.
* src/xdisp.c (build_desired_tool_bar_string): Don't handle separators
specially, since this is now done in parse_tool_bar_item.
* lisp/info.el (info-tool-bar-map): Add separators.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Mon, 20 Dec 2010 08:17:26 +0800 |
| parents | 8fd0d7bcdf7d |
| children | 882d6cbb91a2 |
comparison
equal
deleted
inserted
replaced
| 111997:a5a188ddc758 | 111998:bc8dc4ac1e28 |
|---|---|
| 3767 :vert-only t) | 3767 :vert-only t) |
| 3768 (tool-bar-local-item-from-menu 'Info-history-forward "right-arrow" map Info-mode-map | 3768 (tool-bar-local-item-from-menu 'Info-history-forward "right-arrow" map Info-mode-map |
| 3769 :rtl "left-arrow" | 3769 :rtl "left-arrow" |
| 3770 :label "Forward" | 3770 :label "Forward" |
| 3771 :vert-only t) | 3771 :vert-only t) |
| 3772 (define-key-after map [separator-1] menu-bar-separator) | |
| 3772 (tool-bar-local-item-from-menu 'Info-prev "prev-node" map Info-mode-map | 3773 (tool-bar-local-item-from-menu 'Info-prev "prev-node" map Info-mode-map |
| 3773 :rtl "next-node") | 3774 :rtl "next-node") |
| 3774 (tool-bar-local-item-from-menu 'Info-next "next-node" map Info-mode-map | 3775 (tool-bar-local-item-from-menu 'Info-next "next-node" map Info-mode-map |
| 3775 :rtl "prev-node") | 3776 :rtl "prev-node") |
| 3776 (tool-bar-local-item-from-menu 'Info-up "up-node" map Info-mode-map | 3777 (tool-bar-local-item-from-menu 'Info-up "up-node" map Info-mode-map |
| 3777 :vert-only t) | 3778 :vert-only t) |
| 3779 (define-key-after map [separator-2] menu-bar-separator) | |
| 3778 (tool-bar-local-item-from-menu 'Info-top-node "home" map Info-mode-map) | 3780 (tool-bar-local-item-from-menu 'Info-top-node "home" map Info-mode-map) |
| 3779 (tool-bar-local-item-from-menu 'Info-goto-node "jump-to" map Info-mode-map) | 3781 (tool-bar-local-item-from-menu 'Info-goto-node "jump-to" map Info-mode-map) |
| 3782 (define-key-after map [separator-3] menu-bar-separator) | |
| 3780 (tool-bar-local-item-from-menu 'Info-index "index" map Info-mode-map | 3783 (tool-bar-local-item-from-menu 'Info-index "index" map Info-mode-map |
| 3781 :label "Index Search") | 3784 :label "Index Search") |
| 3782 (tool-bar-local-item-from-menu 'Info-search "search" map Info-mode-map) | 3785 (tool-bar-local-item-from-menu 'Info-search "search" map Info-mode-map) |
| 3783 (tool-bar-local-item-from-menu 'Info-exit "exit" map Info-mode-map) | 3786 (tool-bar-local-item-from-menu 'Info-exit "exit" map Info-mode-map) |
| 3784 map)) | 3787 map)) |