Merge from origin/emacs-26
commit988b53ed2d3287f7ee9cfa4225765a97a245c133
authorGlenn Morris <rgm@gnu.org>
Mon, 18 Jun 2018 19:14:26 +0000 (18 12:14 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 18 Jun 2018 19:14:26 +0000 (18 12:14 -0700)
treedca2fd0df6dea6b5400ea099facc1298ba1eba64
parent2f477cbe7f7754c08e00b2b8bdceb2bc1a836db3
parentebe065fddf76fde64a9c07b419b67fe47fb6c1cb
Merge from origin/emacs-26

ebe065f Prevent errant scroll on mouse click (Bug#31546)
ffd2018 Minor documentation fix
cf4dc95 * lisp/window.el (window-toggle-side-windows): Doc fix.  (Bug...
doc/lispref/windows.texi
lisp/mouse.el
lisp/window.el
src/nsterm.m