diff man/frames.texi @ 83276:26c9034f3533

Merged from [e-mail]--gnu-2005 (patch 192-203) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-192 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-193 Use gdb-ui breakpoint faces on ttys too * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-194 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-195 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-196 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-197 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-198 Tweak gdb-ui breakpoint faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-199 Tweak gdb-ui breakpoint faces * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-200 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-201 Tweak info/.arch-inventory to identify info/.cvsignore as source * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-202 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-203 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-316

--- a/man/frames.texi	Tue Mar 22 17:58:23 2005 +0000
+++ b/man/frames.texi	Wed Mar 23 10:40:00 2005 +0000
@@ -810,16 +810,18 @@
 usually click the wheel to act as either @kbd{Mouse-2} or
 @kbd{Mouse-3}, depending on the setup.  You can also use the wheel to
 scroll windows instead of using the scroll bar or keyboard commands.
-To do so, turn on Mouse Wheel global minor mode with the command
-@kbd{M-x mouse-wheel-mode} or by customizing the variable
-@code{mouse-wheel-mode}.  Support for the wheel depends on the system
-generating appropriate events for Emacs.
+Mouse wheel support only works if the system generates appropriate
+events; whenever possible, it is turned on by default.  To toggle this
+feature, use @kbd{M-x mouse-wheel-mode}.
 
 @vindex mouse-wheel-follow-mouse
 @vindex mouse-wheel-scroll-amount
+@vindex mouse-wheel-progressive-speed
   The variables @code{mouse-wheel-follow-mouse} and
 @code{mouse-wheel-scroll-amount} determine where and by how much
-buffers are scrolled.
+buffers are scrolled.  The variable
+@code{mouse-wheel-progressive-speed} determines whether the the scroll
+speed is linked to how fast you move the wheel.
 
 @node Drag and Drop
 @section Drag and Drop