(Button Properties, Button Buffer Commands):

Clarify mouse-1 and follow-link functionality.

diff --git a/lispref/display.texi b/lispref/display.texi
index 17e4bc57ea05a750ed6270806ce6768495932333..7b0e72c753f83482d0c61220f06eb5374b4bc8b8 100644 (file)
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -4049,9 +4049,8 @@ the usual Emacs @code{highlight} face.
 @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.
+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,8 +4065,9 @@ A string displayed by the Emacs tool-tip help system; by default,
 
 @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}.
+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 non-@code{nil} @code{button} property, which may be useful
@@ -4239,8 +4239,7 @@ These are commands and functions for locating and operating on
 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),
+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,6 +4247,10 @@ available in the keymap stored in @code{button-buffer-map}; a mode
 which uses buttons may want to use @code{button-buffer-map} as a
 parent keymap for its keymap.
 
+If the button has a non-@code{nil} @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}.