*** empty log message ***

[gnu-emacs] / lisp / info.el

diff --git a/lisp/info.el b/lisp/info.el
index 7bbfcd9e79e95681106e3dde666416289414214a..86642b7fd361f73004d26585e1dd35104304e29c 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -61,9 +61,9 @@ The Lisp code is executed when the node is selected.")
   :group 'info)
 
 (defface info-node
-  '((((class color) (background light)) (:foreground "brown" :bold t :italic t))
-    (((class color) (background dark)) (:foreground "white" :bold t :italic t))
-    (t (:bold t :italic t)))
+  '((((class color) (background light)) (:foreground "brown" :weight bold :slant italic))
+    (((class color) (background dark)) (:foreground "white" :weight bold :slant italic))
+    (t (:weight bold :slant italic)))
   "Face for Info node names."
   :group 'info)
 
@@ -74,9 +74,9 @@ The Lisp code is executed when the node is selected.")
   :group 'info)
 
 (defface info-xref
-  '((((class color) (background light)) (:foreground "magenta4" :bold t))
-    (((class color) (background dark)) (:foreground "cyan" :bold t))
-    (t (:bold t)))
+  '((((class color) (background light)) (:foreground "magenta4" :weight bold))
+    (((class color) (background dark)) (:foreground "cyan" :weight bold))
+    (t (:weight bold)))
   "Face for Info cross-references."
   :group 'info)
 
@@ -2151,17 +2151,17 @@ If no reference to follow, moves to the next node, or up if none."
 
 (defvar info-tool-bar-map
   (if (display-graphic-p)
-      (let ((tool-bar-map (make-sparse-keymap)))
-       (tool-bar-add-item-from-menu 'Info-exit "close" Info-mode-map)
-       (tool-bar-add-item-from-menu 'Info-prev "left_arrow" Info-mode-map)
-       (tool-bar-add-item-from-menu 'Info-next "right_arrow" Info-mode-map)
-       (tool-bar-add-item-from-menu 'Info-up "up_arrow" Info-mode-map)
-       (tool-bar-add-item-from-menu 'Info-last "undo" Info-mode-map)
-       (tool-bar-add-item-from-menu 'Info-top-node "home" Info-mode-map)
-       (tool-bar-add-item-from-menu 'Info-index "index" Info-mode-map)
-       (tool-bar-add-item-from-menu 'Info-goto-node "jump_to" Info-mode-map)
-       (tool-bar-add-item-from-menu 'Info-search "search" Info-mode-map)
-       tool-bar-map)))
+      (let ((map (make-sparse-keymap)))
+       (tool-bar-local-item-from-menu 'Info-exit "close" map Info-mode-map)
+       (tool-bar-local-item-from-menu 'Info-prev "left_arrow" map Info-mode-map)
+       (tool-bar-local-item-from-menu 'Info-next "right_arrow" map Info-mode-map)
+       (tool-bar-local-item-from-menu 'Info-up "up_arrow" map Info-mode-map)
+       (tool-bar-local-item-from-menu 'Info-last "undo" map Info-mode-map)
+       (tool-bar-local-item-from-menu 'Info-top-node "home" map Info-mode-map)
+       (tool-bar-local-item-from-menu 'Info-index "index" 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-search "search" map Info-mode-map)
+       map)))
 
 (defvar Info-menu-last-node nil)
 ;; Last node the menu was created for.
@@ -2603,7 +2603,7 @@ the variable `Info-file-list-for-emacs'."
              (if (string-equal tag "Node")
                  (put-text-property nbeg nend 'face 'info-header-node)
                (put-text-property nbeg nend 'face 'info-header-xref)
-               (put-text-property nbeg nend 'mouse-face 'highlight)
+               (put-text-property tbeg nend 'mouse-face 'highlight)
                (put-text-property tbeg nend
                                   'help-echo
                                   (concat "Go to node "
@@ -2616,8 +2616,8 @@ the variable `Info-file-list-for-emacs'."
                                               ("Up" . Info-up))))))
                    (when fun
                      (let ((keymap (make-sparse-keymap)))
-                       (define-key keymap [header-line down-mouse-1] fun)
-                       (define-key keymap [header-line down-mouse-2] fun)
+                       (define-key keymap [header-line mouse-1] fun)
+                       (define-key keymap [header-line mouse-2] fun)
                        (put-text-property tbeg nend 'local-map keymap)))))
                (if (not Info-use-header-line)
                    ;; In case they switched Info-use-header-line off