# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1016096340 0
# Node ID bfe50f90f6660477fb7ee2c29facf048015c4f31
# Parent  55003e5c6707f55814eef0e2274d540e5fee8379
Update doc of local-map and keymap text properties.

diff -r 55003e5c6707 -r bfe50f90f666 lispref/text.texi
--- a/lispref/text.texi	Thu Mar 14 08:57:36 2002 +0000
+++ b/lispref/text.texi	Thu Mar 14 08:59:00 2002 +0000
@@ -2714,21 +2714,22 @@
 This feature is used in the mode line and for other active text.  It is
 available starting in Emacs 21.
 
+@item keymap
+@cindex keymap of character
+@kindex keymap @r{(text property)}
+The @code{keymap} property specifies an additional keymap for
+commands.  The property's value for the character after point, if
+non-@code{nil}, is used for key lookup before the buffer's local map.
+(For mouse clicks, the @code{keymap} property of the character clicked
+on is the one used.)  If the property value is a symbol, the symbol's
+function definition is used as the keymap.  @xref{Active Keymaps}.
+
 @item local-map
-@cindex keymap of character
 @kindex local-map @r{(text property)}
-You can specify a different keymap for some of the text in a buffer by
-means of the @code{local-map} property.  The property's value for the
-character after point, if non-@code{nil}, is used for key lookup instead
-of the buffer's local map.  If the property value is a symbol, the
-symbol's function definition is used as the keymap.  @xref{Active
-Keymaps}.
-
-@item keymap
-@kindex keymap @r{(text property)}
-The @code{keymap} property is similar to @code{local-map} but overrides the
-buffer's local map (and the map specified by the @code{local-map}
-property) rather than replacing it.
+This property specifies a keymap to use @emph{instead of} the buffer's
+local map.  If the property value is a symbol, the symbol's function
+definition is used as the keymap.  For most purposes (perhaps all
+purposes), the @code{keymap} is superior.
 
 @item syntax-table
 The @code{syntax-table} property overrides what the syntax table says