Merge from origin/emacs-26

author Glenn Morris <rgm@gnu.org>

Wed, 17 Apr 2019 16:32:39 +0000 (09:32 -0700)

committer Glenn Morris <rgm@gnu.org>

Wed, 17 Apr 2019 16:32:39 +0000 (09:32 -0700)
author Glenn Morris <rgm@gnu.org>
Wed, 17 Apr 2019 16:32:39 +0000 (09:32 -0700)
committer Glenn Morris <rgm@gnu.org>
Wed, 17 Apr 2019 16:32:39 +0000 (09:32 -0700)
diff --cc doc/lispref/display.texi
Simple merge
diff --cc lisp/gnus/gnus-icalendar.el
Simple merge
diff --cc nt/README.W32
Simple merge
author	Glenn Morris <rgm@gnu.org>
	Wed, 17 Apr 2019 16:32:39 +0000 (09:32 -0700)
committer	Glenn Morris <rgm@gnu.org>
	Wed, 17 Apr 2019 16:32:39 +0000 (09:32 -0700)
		1	2
doc/lispref/display.texi	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/gnus/gnus-icalendar.el	patch \|	diff1 \|	diff2 \|	blob \| history
nt/README.W32	patch \|	diff1 \|	diff2 \|	blob \| history