diff options
| author | Luc Teirlinck <teirllm@auburn.edu> | 2005-07-14 00:57:45 +0000 |
|---|---|---|
| committer | Luc Teirlinck <teirllm@auburn.edu> | 2005-07-14 00:57:45 +0000 |
| commit | dc86f0a908c5ac28453ad829c3f33cf785179321 (patch) | |
| tree | c36bbf5a7986fc345dc547c990ff6772c431f9f7 /lisp/startup.el | |
| parent | 5fc5466286e8a149863199bdc79aa936185837d6 (diff) | |
| download | emacs-dc86f0a908c5ac28453ad829c3f33cf785179321.tar.gz | |
(command-line): Use `custom-reevaluate-setting' again for tooltip-mode.
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 61587019800..cb3dae8123a 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -752,17 +752,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." ;; are not set. (custom-reevaluate-setting 'blink-cursor-mode) (custom-reevaluate-setting 'normal-erase-is-backspace) - - ;; 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)) + (custom-reevaluate-setting 'tooltip-mode) ;; Register default TTY colors for the case the terminal hasn't a ;; terminal init file. |