Merge from origin/emacs-26

author Glenn Morris <rgm@gnu.org>

Mon, 18 Jun 2018 19:14:26 +0000 (12:14 -0700)

committer Glenn Morris <rgm@gnu.org>

Mon, 18 Jun 2018 19:14:26 +0000 (12:14 -0700)
author Glenn Morris <rgm@gnu.org>
Mon, 18 Jun 2018 19:14:26 +0000 (12:14 -0700)
committer Glenn Morris <rgm@gnu.org>
Mon, 18 Jun 2018 19:14:26 +0000 (12:14 -0700)
diff --cc doc/lispref/windows.texi
Simple merge
diff --cc lisp/mouse.el
Simple merge
diff --cc lisp/window.el
Simple merge
diff --cc src/nsterm.m
Simple merge
author	Glenn Morris <rgm@gnu.org>
	Mon, 18 Jun 2018 19:14:26 +0000 (12:14 -0700)
committer	Glenn Morris <rgm@gnu.org>
	Mon, 18 Jun 2018 19:14:26 +0000 (12:14 -0700)
		1	2
doc/lispref/windows.texi	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/mouse.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/window.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/nsterm.m	patch \|	diff1 \|	diff2 \|	blob \| history