(font-lock-keywords): Add defvar.

[gnu-emacs] / lisp / tooltip.el

diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index cb668f9cd00c057b2d533581674af732c9928da0..59f07df00897ca803727280caba2daee9b90ccf6 100644 (file)
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -1,7 +1,7 @@
 ;;; tooltip.el --- show tooltip windows
 
-;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-;;        Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Gerd Moellmann <gerd@acm.org>
 ;; Keywords: help c mouse tools
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -136,6 +136,8 @@ the last mouse movement event that occurred.")
 (defvar tooltip-hide-time nil
   "Time when the last tooltip was hidden.")
 
+(defvar gud-tooltip-mode) ;; Prevent warning.
+
 ;;; Event accessors
 
 (defun tooltip-event-buffer (event)
@@ -152,18 +154,15 @@ This might return nil if the event did not occur over a buffer."
 ;; set-buffer prevents redisplay optimizations, so every mouse motion
 ;; would be accompanied by a full redisplay.
 
-;;;###autoload
 (define-minor-mode tooltip-mode
   "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)))
+                      emacs-basic-display
+                      (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"))