(menu-bar-options-save, menu-bar-showhide-menu):

Add tooltip-mode.

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 273d4739b4d7eec282a6b61006255a021c8a25b9..d0d42b9666d66b46687860b73f0f8ce7df933d6d 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -646,7 +646,8 @@ by \"Save Options\" in Custom buffers.")
           (setq need-save t)))
     ;; These are set with `customize-set-variable'.
     (dolist (elt '(scroll-bar-mode
-                  debug-on-quit debug-on-error menu-bar-mode tool-bar-mode
+                  debug-on-quit debug-on-error
+                  tooltip-mode menu-bar-mode tool-bar-mode
                   save-place uniquify-buffer-name-style fringe-mode
                   fringe-indicators case-fold-search
                   display-time-mode auto-compression-mode
@@ -910,6 +911,12 @@ by \"Save Options\" in Custom buffers.")
        :visible `(display-graphic-p)
        :help "Select scroll-bar mode"))
 
+(define-key menu-bar-showhide-menu [showhide-tooltip-mode]
+  (list 'menu-item "Tooltips" 'tooltip-mode
+       :help "Toggle tooltips on/off"
+       :visible  `(and (display-graphic-p) (fboundp 'x-show-tip))
+       :button `(:toggle . tooltip-mode)))
+
 (define-key menu-bar-showhide-menu [menu-bar-mode]
   '(menu-item "Menu-bar" menu-bar-mode
              :help "Toggle menu-bar on/off"