Merge from origin/emacs-25

93c0f51 Handle TeX comments when making new paragraph
e0884f1 Restore keystroke echo in 'C-q'
a6213ce Improve documentation of 'current-word'
0828126 Fix a typo in an Eshell defcustom
2e361c7 Minor copyedits of electric-pair-mode
7499ee8 ; Minor copyedit in the Emacs manual
45b652b Fix documentation of 'invocation-directory'
7f43d7c * admin/authors.el (authors-aliases): Add an entry.
ba48880 ; Fix pl-refcard.tex

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

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

diff --cc lisp/eshell/esh-mode.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/textmodes/tex-mode.el
Simple merge