Merge from origin/emacs-25

author Paul Eggert <eggert@cs.ucla.edu>

Mon, 22 Aug 2016 21:38:50 +0000 (14:38 -0700)

committer Paul Eggert <eggert@cs.ucla.edu>

Mon, 22 Aug 2016 21:38:50 +0000 (14:38 -0700)
author Paul Eggert <eggert@cs.ucla.edu>
Mon, 22 Aug 2016 21:38:50 +0000 (14:38 -0700)
committer Paul Eggert <eggert@cs.ucla.edu>
Mon, 22 Aug 2016 21:38:50 +0000 (14:38 -0700)
diff --cc doc/lispref/windows.texi
Simple merge
diff --cc etc/NEWS
Simple merge
author	Paul Eggert <eggert@cs.ucla.edu>
	Mon, 22 Aug 2016 21:38:50 +0000 (14:38 -0700)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Mon, 22 Aug 2016 21:38:50 +0000 (14:38 -0700)
		1	2
doc/lispref/windows.texi	patch \|	diff1 \|	diff2 \|	blob \| history
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history