Merge from emacs--rel--22

[gnu-emacs] / lisp / help-at-pt.el

diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el
index 562102217da8ce866ae63582134709494123d6d3..cf9a07b0f56eacd0aef88e9da3addc8fb441a4a9 100644 (file)
--- a/lisp/help-at-pt.el
+++ b/lisp/help-at-pt.el
@@ -1,6 +1,6 @@
 ;;; help-at-pt.el --- local help through the keyboard
 
-;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Luc Teirlinck <teirllm@auburn.edu>
 ;; Keywords: help
@@ -9,7 +9,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -350,9 +350,7 @@ different regions.  With numeric argument ARG, behaves like
   (interactive "p")
   (scan-buf-move-to-region 'help-echo (- arg) 'scan-buf-move-hook))
 
-(add-hook 'help-at-pt-unload-hook 'help-at-pt-cancel-timer)
-
 (provide 'help-at-pt)
 
-;;; arch-tag: d0b8b86d-d23f-45d0-a82d-208d6205a583
+;; arch-tag: d0b8b86d-d23f-45d0-a82d-208d6205a583
 ;;; help-at-pt.el ends here