Merged from emacs@sv.gnu.org.

[bpt/emacs.git] / lisp / help-at-pt.el

diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el
index d55a9a6..6d33c15 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 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Luc Teirlinck <teirllm@auburn.edu>
 ;; Keywords: help
@@ -19,8 +19,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:
 
@@ -53,7 +53,7 @@
 (defgroup help-at-pt nil
   "Features for displaying local help."
   :group 'help
-  :version "21.4")
+  :version "22.1")
 
 ;;;###autoload
 (defun help-at-pt-string (&optional kbd)
@@ -124,8 +124,7 @@ new value."
         (set-default variable value)
         (and (boundp 'help-at-pt-timer)
              help-at-pt-timer
-             (timer-set-idle-time help-at-pt-timer value t)))
-  :version "21.4")
+             (timer-set-idle-time help-at-pt-timer value t))))
 
 ;;;###autoload
 (defun help-at-pt-cancel-timer ()
@@ -147,6 +146,7 @@ This is done by setting a timer, if none is currently active."
          (run-with-idle-timer
           help-at-pt-timer-delay t #'help-at-pt-maybe-display))))
 
+;;;###autoload
 (defcustom help-at-pt-display-when-idle 'never
   "*Automatically show local help on point-over.
 If the value is t, the string obtained from any `kbd-help' or
@@ -228,8 +228,7 @@ properties, to enable buffer local values."
               (help-at-pt-cancel-timer)
             (help-at-pt-set-timer)))
   :set-after '(help-at-pt-timer-delay)
-  :require 'help-at-pt
-  :version "21.4")
+  :require 'help-at-pt)
 
 ;; Function for use in `help-at-pt-set-timer'.
 (defun help-at-pt-maybe-display ()
@@ -247,7 +246,7 @@ properties, to enable buffer local values."
 (defun scan-buf-move-to-region (prop &optional arg hook)
   "Go to the start of the next region with non-nil PROP property.
 Then run HOOK, which should be a quoted symbol that is a normal
-hook.variable, or an expression evaluating to such a symbol.
+hook variable, or an expression evaluating to such a symbol.
 Adjacent areas with different non-nil PROP properties are
 considered different regions.