Merge from origin/emacs-26

author Glenn Morris <rgm@gnu.org>

Wed, 28 Nov 2018 15:51:11 +0000 (07:51 -0800)

committer Glenn Morris <rgm@gnu.org>

Wed, 28 Nov 2018 15:51:11 +0000 (07:51 -0800)
author Glenn Morris <rgm@gnu.org>
Wed, 28 Nov 2018 15:51:11 +0000 (07:51 -0800)
committer Glenn Morris <rgm@gnu.org>
Wed, 28 Nov 2018 15:51:11 +0000 (07:51 -0800)
diff --cc src/nsterm.m
Simple merge
diff --cc src/xdisp.c
Simple merge
author	Glenn Morris <rgm@gnu.org>
	Wed, 28 Nov 2018 15:51:11 +0000 (07:51 -0800)
committer	Glenn Morris <rgm@gnu.org>
	Wed, 28 Nov 2018 15:51:11 +0000 (07:51 -0800)
		1	2
src/nsterm.m	patch \|	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	patch \|	diff1 \|	diff2 \|	blob \| history