[Emacs-diffs] Changes to emacs/lispref/text.texi

[Richard M. Stallman]

Index: emacs/lispref/text.texi
diff -c emacs/lispref/text.texi:1.52 emacs/lispref/text.texi:1.53
*** emacs/lispref/text.texi:1.52        Sun Nov 25 07:38:29 2001
--- emacs/lispref/text.texi     Thu Mar 14 03:59:00 2002
***************
*** 2714,2734 ****
  This feature is used in the mode line and for other active text.  It is
  available starting in Emacs 21.
  
- @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 address@hidden, 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.
  
  @item syntax-table
  The @code{syntax-table} property overrides what the syntax table says
--- 2714,2735 ----
  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
! address@hidden, 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
! @kindex local-map @r{(text property)}
! 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