*** empty log message ***

3 files changed, 29 insertions, 14 deletions

diff --git a/lispref/display.texi b/lispref/display.texi
index 5992c36171d..ecdf52b69c0 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -895,14 +895,22 @@ sense---only on the screen.
 If this property is non-@code{nil}, the overlay is deleted automatically
 if it ever becomes empty (i.e., if it spans no characters).
 
-@item local-map
+@item keymap
 @cindex keymap of character (and overlays)
-@kindex local-map @r{(overlay property)}
+@kindex keymap @r{(overlay property)}
 If this property is non-@code{nil}, it specifies a keymap for a portion
 of the text.  The property's value replaces the buffer's local map, when
 the character after point is within the overlay.  @xref{Active Keymaps}.
 @end table
 
+@item local-map
+@cindex keymap of character (and overlays)
+@kindex local-map @r{(overlay property)}
+This property is like the @code{keymap} property, except that it doesn't
+replace the buffer's local map.  Keys not defined in the keymap
+specified with @code{local-map} are looked up in the buffer's local map.
+@end table
+
 @node Managing Overlays
 @subsection Managing Overlays
 
diff --git a/lispref/modes.texi b/lispref/modes.texi
index 12686adac48..58914ddf77f 100644
--- a/lispref/modes.texi
+++ b/lispref/modes.texi
@@ -1449,28 +1449,28 @@ The value of @code{global-mode-string}.  Currently, only
   Starting in Emacs 21, certain text properties are meaningful in the
 mode line.  The @code{face} property affects the appearance of text; the
 @code{help-echo} property associate help strings with the text, and
-@code{local-map} can make the text mouse-sensitive.
+@code{keymap} can make the text mouse-sensitive.
 
   There are three ways to specify text properties for text in the mode
 line:
 
 @enumerate
 @item
-Put a string with the @code{local-map} property directly into the
-mode-line data structure.
+Put a string with the @code{keymap} property directly into the mode-line
+data structure.
 
 @item
-Put a @code{local-map} property on a mode-line %-construct
-such as @samp{%12b}; then the expansion of the %-construct
-will have that same text property.
+Put a @code{keymap} property on a mode-line %-construct such as
+@samp{%12b}; then the expansion of the %-construct will have that same
+text property.
 
 @item
 Use a list containing @code{:eval @var{form}} in the mode-line data
 structure, and make @var{form} evaluate to a string that has a
-@code{local-map} property.
+@code{keymap} property.
 @end enumerate
 
-  You use the @code{local-map} property to specify a keymap.  Like any
+  You use the @code{keymap} property to specify a keymap.  Like any
 keymap, it can bind character keys and function keys; but that has no
 effect, since it is impossible to move point into the mode line.  This
 keymap can only take real effect for mouse clicks.
diff --git a/lispref/text.texi b/lispref/text.texi
index ac157f70304..f50c8913518 100644
--- a/lispref/text.texi
+++ b/lispref/text.texi
@@ -2659,16 +2659,23 @@ move the mouse onto that text, Emacs displays that string in the echo
 area, or in the tooltip window.  This feature is used in the mode line.
 It is available starting in Emacs 21.
 
-@item local-map
+@item keymap
 @cindex keymap of character
-@kindex local-map @r{(text property)}
+@kindex keymap @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
+means of the @code{keymap} 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 local-map
+@cindex keymap of character
+@kindex local-map @r{(text property)}
+This property is like the @code{keymap} property, except that it doesn't
+replace the buffer's local map.  Keys not defined in the keymap
+specified with @code{local-map} are looked up in the buffer's local map.
+
 @item syntax-table
 The @code{syntax-table} property overrides what the syntax table says
 about this particular character.  @xref{Syntax Properties}.
@@ -3062,7 +3069,7 @@ file to visit, based on the position found in the event.
 
   Instead of defining a mouse command for the major mode, you can define
 a key binding for the clickable text itself, using the @code{local-map}
-text property:
+or @code{keymap} text properties:
 
 @example
 (let ((map (make-sparse-keymap)))