Merge from origin/emacs-25
commit3ace6b1e8511cf099a9297b066ea8f61ee12037e
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:39:07 +0000 (7 12:39 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 7 Dec 2016 20:39:07 +0000 (7 12:39 -0800)
treed01ad75b9a5793043c9c275173bc0de057903e02
parentfa8dbb61a003ece2cc08c83bda4f21f393340b2f
parent93c0f5126a50a0b1267ba74c444701af9ad46dc6
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
doc/emacs/maintaining.texi
doc/lispref/os.texi
lisp/eshell/esh-mode.el
lisp/simple.el
lisp/textmodes/tex-mode.el