Merge from origin/emacs-26

0e8d452 ; * doc/lispref/nonascii.texi (Coding System Basics): Fix gra...
25a2ff7 ; Add missing space in custom.texi
9ec18fb * admin/admin.el (set-version): Check for increase in version...
93912ba Be more careful about indent-sexp going over eol (Bug#35286)

diff --cc admin/admin.el
Simple merge

diff --cc doc/emacs/custom.texi
Simple merge

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

diff --cc lisp/emacs-lisp/lisp-mode.el
Simple merge