Merge from trunk.

[gnu-emacs] / lisp / tooltip.el

diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 5987b00f92efeca06ef004d64b11ed0f5758a20a..bfe53dc71b75d525a0b4f0f0e48ed3766acf7537 100644 (file)
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -1,7 +1,6 @@
 ;;; tooltip.el --- show tooltip windows
 
-;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999-2011 Free Software Foundation, Inc.
 
 ;; Author: Gerd Moellmann <gerd@acm.org>
 ;; Keywords: help c mouse tools
@@ -199,7 +198,7 @@ This might return nil if the event did not occur over a buffer."
   (setq tooltip-timeout-id
        (add-timeout (tooltip-delay) 'tooltip-timeout nil)))
 
-(defun tooltip-timeout (object)
+(defun tooltip-timeout (_object)
   "Function called when timer with id `tooltip-timeout-id' fires."
   (run-hook-with-args-until-success 'tooltip-functions
                                    tooltip-last-mouse-motion-event))
@@ -257,7 +256,7 @@ in echo area."
 
 (declare-function x-hide-tip "xfns.c" ())
 
-(defun tooltip-hide (&optional ignored-arg)
+(defun tooltip-hide (&optional _ignored-arg)
   "Hide a tooltip, if one is displayed.
 Value is non-nil if tooltip was open."
   (tooltip-cancel-delayed-tip)
@@ -374,7 +373,7 @@ MSG is either a help string to display, or nil to cancel the display."
     ;; On text-only displays, try `tooltip-show-help-non-mode'.
     (tooltip-show-help-non-mode msg)))
 
-(defun tooltip-help-tips (event)
+(defun tooltip-help-tips (_event)
   "Hook function to display a help tooltip.
 This is installed on the hook `tooltip-functions', which
 is run when the timer with id `tooltip-timeout-id' fires.
@@ -385,5 +384,4 @@ Value is non-nil if this function handled the tip."
 
 (provide 'tooltip)
 
-;; arch-tag: 3d61135e-4618-4a78-af28-183f6df5636f
 ;;; tooltip.el ends here