master updated (c1fbbc57a9 -> 3c82e96954)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  c1fbbc57a9 Fix race conditions processing zoom events on Haiku
       new  69f42faa50 Clarify select-active-regions doc string
       new  3c82e96954 Add new user option display-buffer-avoid-small-windows


Summary of changes:
 doc/lispref/windows.texi |  5 +++++
 etc/NEWS                 |  4 ++++
 lisp/window.el           | 23 +++++++++++++++++++----
 src/keyboard.c           |  9 +++++----
 4 files changed, 33 insertions(+), 8 deletions(-)