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

[Kim F . Storm]

Index: emacs/lispref/display.texi
diff -c emacs/lispref/display.texi:1.143 emacs/lispref/display.texi:1.144
*** emacs/lispref/display.texi:1.143    Wed Jan 12 05:11:56 2005
--- emacs/lispref/display.texi  Wed Jan 12 15:33:00 2005
***************
*** 4049,4057 ****
  @kindex keymap @r{(button property)}
  The button's keymap, defining bindings active within the button
  region.  By default this is the usual button region keymap, stored
! in the variable @code{button-map}, which defines @key{RET},
! @key{mouse-1} (if @var{mouse-1-click-follows-link} is set),
! and @key{mouse-2} to invoke the button.
  
  @item type
  @kindex type @r{(button property)}
--- 4049,4056 ----
  @kindex keymap @r{(button property)}
  The button's keymap, defining bindings active within the button
  region.  By default this is the usual button region keymap, stored
! in the variable @code{button-map}, which defines @key{RET} and
! @key{mouse-2} to invoke the button.
  
  @item type
  @kindex type @r{(button property)}
***************
*** 4066,4073 ****
  
  @item follow-link
  @kindex follow-link @r{(button property)}
! The follow-link property, defining how a @key{mouse-1} click behaves
! on this button, @xref{Enabling Mouse-1 to Follow Links}.
  @item button
  @kindex button @r{(button property)}
  All buttons have a address@hidden @code{button} property, which may be useful
--- 4065,4073 ----
  
  @item follow-link
  @kindex follow-link @r{(button property)}
! The follow-link property, defining how a @key{Mouse-1} click behaves
! on this button, @xref{Links and Mouse-1}.
! 
  @item button
  @kindex button @r{(button property)}
  All buttons have a address@hidden @code{button} property, which may be useful
***************
*** 4239,4246 ****
  buttons in an Emacs buffer.
  
  @code{push-button} is the command that a user uses to actually `push'
! a button, and is bound by default in the button itself to @key{RET},
! to @key{mouse-1} (if @var{mouse-1-click-follows-link} is set),
  and to @key{mouse-2} using a region-specific keymap.  Commands
  that are useful outside the buttons itself, such as
  @code{forward-button} and @code{backward-button} are additionally
--- 4239,4245 ----
  buttons in an Emacs buffer.
  
  @code{push-button} is the command that a user uses to actually `push'
! a button, and is bound by default in the button itself to @key{RET}
  and to @key{mouse-2} using a region-specific keymap.  Commands
  that are useful outside the buttons itself, such as
  @code{forward-button} and @code{backward-button} are additionally
***************
*** 4248,4253 ****
--- 4247,4256 ----
  which uses buttons may want to use @code{button-buffer-map} as a
  parent keymap for its keymap.
  
+ If the button has a address@hidden @code{follow-link} property, and
+ @var{mouse-1-click-follows-link} is set, a @key{Mouse-1} click will
+ also activate the @code{push-button} command.
+ 
  @deffn Command push-button &optional pos use-mouse-action
  @tindex push-button
  Perform the action specified by a button at location @var{pos}.