Add keyword :vert-only for tool bar items with labels not shown horizontally.

* lisp/info.el (info-tool-bar-map): Add some :vert-only keywords.

* lisp/tool-bar.el (tool-bar-setup): Add some :vert-only keywords.

* src/dispextern.h (tool_bar_item_idx): Add TOOL_BAR_ITEM_VERT_ONLY.

* src/gtkutil.c (xg_make_tool_item): Take vert_only as argument.
Set important to ! vert_only.
(xg_show_toolbar_item): Don't show label horizontally if
tool item isn't important.
(update_frame_tool_bar): Get TOOL_BAR_ITEM_VERT_ONLY and pass it to
xg_make_tool_item, or update important on existing tool item.

* src/keyboard.c (QCvert_only): New variable.
(parse_tool_bar_item): Check for QCvert_only.
(syms_of_keyboard): Initialize QCvert_only.

3 files changed, 24 insertions, 13 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 345f31fc8ff..0594cca0b8d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-20  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * tool-bar.el (tool-bar-setup): Add some :vert-only keywords.
+
+        * info.el (info-tool-bar-map): Add some :vert-only keywords.
+
 2010-11-20  Eli Zaretskii  <eliz@gnu.org>
 
         * international/characters.el (glyphless-char-display-control):
diff --git a/lisp/info.el b/lisp/info.el
index 3e3ecc131cf..7c0333f6b8e 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3763,15 +3763,18 @@ If FORK is non-nil, it is passed to `Info-goto-node'."
   (let ((map (make-sparse-keymap)))
     (tool-bar-local-item-from-menu 'Info-history-back "left-arrow" map Info-mode-map
                                    :rtl "right-arrow"
-                                   :label "Back")
+                                   :label "Back"
+                                   :vert-only t)
     (tool-bar-local-item-from-menu 'Info-history-forward "right-arrow" map Info-mode-map
                                    :rtl "left-arrow"
-                                   :label "Forward")
+                                   :label "Forward"
+                                   :vert-only t)
     (tool-bar-local-item-from-menu 'Info-prev "prev-node" map Info-mode-map
                                    :rtl "next-node")
     (tool-bar-local-item-from-menu 'Info-next "next-node" map Info-mode-map
                                    :rtl "prev-node")
-    (tool-bar-local-item-from-menu 'Info-up "up-node" map Info-mode-map)
+    (tool-bar-local-item-from-menu 'Info-up "up-node" map Info-mode-map
+                                   :vert-only t)
     (tool-bar-local-item-from-menu 'Info-top-node "home" map Info-mode-map)
     (tool-bar-local-item-from-menu 'Info-goto-node "jump-to" map Info-mode-map)
     (tool-bar-local-item-from-menu 'Info-index "index" map Info-mode-map
diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el
index 6630d85cd3e..4b6fd970d8a 100644
--- a/lisp/tool-bar.el
+++ b/lisp/tool-bar.el
@@ -260,31 +260,33 @@ holds a keymap."
   ;; People say it's bad to have EXIT on the tool bar, since users
   ;; might inadvertently click that button.
   ;;(tool-bar-add-item-from-menu 'save-buffers-kill-emacs "exit")
-  (tool-bar-add-item-from-menu 'find-file "new" nil :label "New File")
-  (tool-bar-add-item-from-menu 'menu-find-file-existing "open")
-  (tool-bar-add-item-from-menu 'dired "diropen")
-  (tool-bar-add-item-from-menu 'kill-this-buffer "close")
-  (tool-bar-add-item-from-menu 'save-buffer "save" nil
+  (tool-bar-add-item-from-menu 'find-file "new" nil :label "New File"
+                               :vert-only t)
+  (tool-bar-add-item-from-menu 'menu-find-file-existing "open" nil
+                               :vert-only t)
+  (tool-bar-add-item-from-menu 'dired "diropen" nil :vert-only t)
+  (tool-bar-add-item-from-menu 'kill-this-buffer "close" nil :vert-only t)
+  (tool-bar-add-item-from-menu 'save-buffer "save" nil :vert-only t
                                :visible '(or buffer-file-name
                                              (not (eq 'special
                                                       (get major-mode
                                                            'mode-class)))))
-  (tool-bar-add-item-from-menu 'write-file "saveas" nil
+  (tool-bar-add-item-from-menu 'write-file "saveas" nil :vert-only t
                                :visible '(or buffer-file-name
                                              (not (eq 'special
                                                       (get major-mode
                                                            'mode-class)))))
-  (tool-bar-add-item-from-menu 'undo "undo" nil
+  (tool-bar-add-item-from-menu 'undo "undo" nil :vert-only t
                                :visible '(not (eq 'special (get major-mode
                                                                 'mode-class))))
   (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [cut])
-                               "cut" nil
+                               "cut" nil :vert-only t
                                :visible '(not (eq 'special (get major-mode
                                                                 'mode-class))))
   (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [copy])
-                               "copy")
+                               "copy" nil :vert-only t)
   (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [paste])
-                               "paste" nil
+                               "paste" nil :vert-only t
                                :visible '(not (eq 'special (get major-mode
                                                                 'mode-class))))
   (tool-bar-add-item-from-menu 'nonincremental-search-forward "search"