master updated (ab5b2e63fa -> de419bba04)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  ab5b2e63fa Respect `x-cursor-fore-pixel' on Haiku
       new  130cd70d9b Improve the ediff-diff-options documentation
       new  f655bd2008 Give a better error in locate-default-make-command-line
       new  cb09a1120e Make the eintr.html target match what's on the web
       new  de419bba04 Fix the Scroll key binding on Windows


Summary of changes:
 doc/lispintro/Makefile.in           | 4 ++--
 doc/lispintro/emacs-lisp-intro.texi | 2 --
 doc/misc/ediff.texi                 | 3 ++-
 lisp/bindings.el                    | 4 +++-
 lisp/locate.el                      | 2 ++
 lisp/scroll-lock.el                 | 2 +-
 lisp/vc/ediff-diff.el               | 5 ++++-
 7 files changed, 14 insertions(+), 8 deletions(-)