Merge master into feature/improved-locked-narrowing.

diff --cc lisp/subr.el
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/xdisp.c
Simple merge