Merge from origin/emacs-26

c26d452 (origin/emacs-26) * src/macfont.m (macfont_shape): Use conven...
140e7f8 Recommend using font-lock-face over face (Bug#35044)
7cb5364 Check if mouse_face_overlay was deleted (Bug#35273)

# Conflicts:
#	src/macfont.m

diff --cc doc/lispref/modes.texi
Simple merge

diff --cc src/macfont.m
Simple merge

diff --cc src/xdisp.c
Simple merge