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

[Luc Teirlinck]

Index: emacs/lisp/tooltip.el
diff -c emacs/lisp/tooltip.el:1.61 emacs/lisp/tooltip.el:1.62
*** emacs/lisp/tooltip.el:1.61  Sun Jul 10 16:40:11 2005
--- emacs/lisp/tooltip.el       Tue Jul 12 20:14:40 2005
***************
*** 159,169 ****
    "Toggle Tooltip display.
  With ARG, turn tooltip mode on if and only if ARG is positive."
    :global t
    :init-value (not (or noninteractive
!                      emacs-quick-startup
!                      (not (display-graphic-p))
                       (not (fboundp 'x-show-tip))))
-   :initialize 'custom-initialize-safe-default
    :group 'tooltip
    (unless (or (null tooltip-mode) (fboundp 'x-show-tip))
      (error "Sorry, tooltips are not yet available on this system"))
--- 159,171 ----
    "Toggle Tooltip display.
  With ARG, turn tooltip mode on if and only if ARG is positive."
    :global t
+   ;; If you change the :init-value below, you also need to change the
+   ;; corresponding code in startup.el.
    :init-value (not (or noninteractive
!                      (and (boundp 'emacs-quick-startup) emacs-quick-startup)
!                      (not (and (fboundp 'display-graphic-p)
!                                (display-graphic-p)))
                       (not (fboundp 'x-show-tip))))
    :group 'tooltip
    (unless (or (null tooltip-mode) (fboundp 'x-show-tip))
      (error "Sorry, tooltips are not yet available on this system"))