bug#12801: 24.3.50; `scroll-conservatively' and `scroll-step'

[Eli Zaretskii]

> Date: Mon, 05 Nov 2012 05:53:52 +0200
> From: Eli Zaretskii <eliz@gnu.org>
> Cc: 12801@debbugs.gnu.org
> 
> So the code works as intended.  The documentation is not wrong, as it
> describes scroll-conservatively before scroll-step, and the
> description quite naturally should lead one to the above conclusion,
> because these two variables contradict each other.  I will make the
> documentation more clear on this, though.

Done in revision 110785 on the emacs-24 branch.