# HG changeset patch # User Luc Teirlinck # Date 1121199357 0 # Node ID 07d8968e1e9cc825bfa5b3a634e9e4977d6ed85e # Parent 808b36b5395eef52e22cc3a3976d411a1008122c (command-line): Revert to previous handling of tooltip-mode. Explain in comment why the complexity is needed. diff -r 808b36b5395e -r 07d8968e1e9c lisp/startup.el --- a/lisp/startup.el Tue Jul 12 20:14:40 2005 +0000 +++ b/lisp/startup.el Tue Jul 12 20:15:57 2005 +0000 @@ -752,7 +752,18 @@ ;; are not set. (custom-reevaluate-setting 'blink-cursor-mode) (custom-reevaluate-setting 'normal-erase-is-backspace) - (custom-reevaluate-setting 'tooltip-mode) + + ;; If you change the code below, you need to also change the + ;; corresponding code in the tooltip-mode defcustom. The two need + ;; to be equivalent under all conditions, or Custom will get confused. + ;; We can not use `custom-reevaluate-setting' here, because it would + ;; load the tooltip library on systems for which that does not make sense. + + (unless (or noninteractive + emacs-basic-display + (not (display-graphic-p)) + (not (fboundp 'x-show-tip))) + (tooltip-mode 1)) ;; Register default TTY colors for the case the terminal hasn't a ;; terminal init file.