[Emacs-diffs] Changes to emacs/lisp/startup.el

[Luc Teirlinck]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.366 emacs/lisp/startup.el:1.367
*** emacs/lisp/startup.el:1.366 Tue Jul 12 20:30:04 2005
--- emacs/lisp/startup.el       Thu Jul 14 00:57:45 2005
***************
*** 752,768 ****
    ;; 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))
  
    ;; Register default TTY colors for the case the terminal hasn't a
    ;; terminal init file.
--- 752,758 ----
    ;; are not set.
    (custom-reevaluate-setting 'blink-cursor-mode)
    (custom-reevaluate-setting 'normal-erase-is-backspace)
!   (custom-reevaluate-setting 'tooltip-mode)
  
    ;; Register default TTY colors for the case the terminal hasn't a
    ;; terminal init file.