*** empty log message ***

1 files changed, 10 insertions, 2 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