Merge from origin/emacs-26

070e82b ; * src/window.c (window_scroll): Improve commentary.
60457d7 Improve documentation of the window tree
ea1a014 Fix window scrolling on TTY frames when there's no mode line
df7ed10 Fix decoding XML files encoded in ISO-8859
7851ae8 (tag: emacs-26.1.90) ; ChangeLog.3 update
1958808 * etc/AUTHORS: Update.
7252507 Fix description of some window hooks
88762b4 Run 'window--adjust-process-windows' when frame size changes ...
d6542ea Avoid errors in zone.el when there's overlay at EOB

diff --cc doc/lispref/windows.texi
index af497cf6af9f845048d26f946114bbd80d414d71,04689f1c5e2343b7ff41fb6af041c961c11e1fec..b86bccab202cedb756d362175c4d2daee3dc427e
--- 1/doc/lispref/windows.texi
--- 2/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@@ -6028,26 -6016,12 +6029,20 @@@ whether a specific window has changed s
  @code{window-pixel-height-before-size-change} and
  @code{window-pixel-height} for that window (@pxref{Window Sizes}).
  
 +The buffer-local value of this hook is run once for the buffer and the
 +frame in question, provided at least one window showing the buffer on
 +that frame has changed its size.  As it still receives the frame as
 +its sole argument, any function called on a buffer-local basis will be
 +oblivious to which window(s) showing the buffer changed its (their)
 +size and has to check out these windows by using the method described
 +in the previous paragraph.
 +
  These function are usually only called when at least one window was
- added or has changed size since the last time this hook was run for the
- associated frame.  In some rare cases this hook also runs when a window
- that was added intermittently has been deleted afterwards.  In these
- cases none of the windows on the frame will appear to have changed its
- size.
- 
- You may use @code{save-selected-window} in these functions
- (@pxref{Selecting Windows}).  However, do not use
- @code{save-window-excursion} (@pxref{Window Configurations}); exiting
- that macro counts as a size change, which would cause these functions to
- be called again.
+ added or has changed size since the last time this hook was run for
+ the associated frame.  In some rare cases this hook also runs when a
+ window that was added intermittently has been deleted afterwards.  In
+ these cases none of the windows on the frame will appear to have
+ changed its size.
  @end defvar
  
  @defvar window-configuration-change-hook

diff --cc lisp/international/mule.el
Simple merge

diff --cc lisp/window.el
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/window.h
Simple merge