[Emacs-diffs] master updated (604724e -> ce88155)

[Noam Postavsky]

npostavs pushed a change to branch master.

      from  604724e   (xref-collect-matches): Use '-E' together with '-e'
       new  d17e92d   Refactor uses of scroll_margin to a function
       new  c92fc7a   Don't count mode line for scroll-margin limit
       new  e27a91c   Make limit on scroll-margin variable
       new  b9be4c1   Fix scrolling with partial lines
       new  da515a0   Add tests for scrolling
       new  ce88155   ; Merge: fixes and updates to scroll margin (Bug#5718)


Summary of changes:
 doc/emacs/display.texi      |   12 ++--
 doc/lispref/windows.texi    |   15 +++++
 etc/NEWS                    |    5 ++
 lisp/cus-start.el           |    1 +
 src/dispextern.h            |    1 +
 src/window.c                |   53 ++++++++++++------
 src/window.h                |    2 +
 src/xdisp.c                 |  104 +++++++++++++++-------------------
 test/manual/scroll-tests.el |  130 +++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 243 insertions(+), 80 deletions(-)
 create mode 100644 test/manual/scroll-tests.el