changeset 29076:c7c150b377c0

*** empty log message ***

--- a/lispref/display.texi	Mon May 22 07:01:17 2000 +0000
+++ b/lispref/display.texi	Mon May 22 11:30:12 2000 +0000
@@ -895,12 +895,20 @@
 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 keymap
+@cindex keymap of character (and overlays)
+@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)}
-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}.
+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

--- a/lispref/modes.texi	Mon May 22 07:01:17 2000 +0000
+++ b/lispref/modes.texi	Mon May 22 11:30:12 2000 +0000
@@ -1449,28 +1449,28 @@
   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.

--- a/lispref/text.texi	Mon May 22 07:01:17 2000 +0000
+++ b/lispref/text.texi	Mon May 22 11:30:12 2000 +0000
@@ -2659,16 +2659,23 @@
 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 @@
 
   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)))