Preload tooltip.el unconditionally.

3 files changed, 3 insertions, 5 deletions

diff --git a/lisp/loadup.el b/lisp/loadup.el
index c32bd00463e..27148ceea75 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -276,7 +276,7 @@
 
 (load "vc/vc-hooks")
 (load "vc/ediff-hook")
-(if (fboundp 'x-show-tip) (load "tooltip"))
+(if (not (eq system-type 'ms-dos)) (load "tooltip"))
 
 ;If you want additional libraries to be preloaded and their
 ;doc strings kept in the DOC file rather than in core,
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index fe2d9caf10f..557c24d6128 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -2374,7 +2374,7 @@ first (leftmost) menu-bar item; you can select other items by typing
   :group 'display
   :version "24.4")
 
-(defvar tty-menu--initial-menu-x 10
+(defvar tty-menu--initial-menu-x 1
   "X coordinate of the first menu-bar menu dropped by F10.
 
 This is meant to be used only for debugging TTY menus.")
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 657951d7b75..6ffa55bc14d 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -58,9 +58,7 @@ echo area, instead of making a pop-up window."
   :init-value t
   :initialize 'custom-initialize-delay
   :group 'tooltip
-  (unless (or (null tooltip-mode) (fboundp 'x-show-tip))
-    (error "Sorry, tooltips are not yet available on this system"))
-  (if tooltip-mode
+  (if (and tooltip-mode (fboundp 'x-show-tip))
       (progn
         (add-hook 'pre-command-hook 'tooltip-hide)
         (add-hook 'tooltip-functions 'tooltip-help-tips))