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

3 files changed, 10 insertions, 5 deletions

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index de4fb43ec1d..66781ad2bea 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -2580,7 +2580,7 @@ current list, it is used @emph{as well as} the others.
 This tells the tags commands to look at the @file{TAGS} files in your
 @file{~/emacs} directory and in the @file{/usr/local/lib/emacs/src}
 directory.  The order depends on which file you are in and which tags
-table mentions that file, as explained above.
+table mentions that file.
 
   Do not set both @code{tags-file-name} and @code{tags-table-list}.
 
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 0c79d9c3de1..e409affd67d 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -877,21 +877,25 @@ features of Electric Pair mode:
 
 @itemize @bullet
 @item
+@vindex electric-pair-preserve-balance
 @code{electric-pair-preserve-balance}, when non-@code{nil}, makes the
 default pairing logic balance out the number of opening and closing
 delimiters.
 
 @item
+@vindex electric-pair-delete-adjacent-pairs
 @code{electric-pair-delete-adjacent-pairs}, when non-@code{nil}, makes
 backspacing between two adjacent delimiters also automatically delete
 the closing delimiter.
 
 @item
+@vindex electric-pair-open-newline-between-pairs
 @code{electric-pair-open-newline-between-pairs}, when non-@code{nil},
-makes inserting inserting a newline between two adjacent pairs also
-automatically open and extra newline after point.
+makes inserting a newline between two adjacent pairs also
+automatically open an extra newline after point.
 
 @item
+@vindex electric-pair-skip-whitespace
 @code{electric-pair-skip-whitespace}, when non-@code{nil}, causes the minor
 mode to skip whitespace forward before deciding whether to skip over
 the closing delimiter.
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 409c9922e79..1a45eac04e3 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -1057,8 +1057,9 @@ value is a string, and does not include a directory name.
 @end defvar
 
 @defvar invocation-directory
-This variable holds the directory from which the Emacs executable was
-invoked, or @code{nil} if that directory cannot be determined.
+This variable holds the directory in which the Emacs executable was
+located when it was run, or @code{nil} if that directory cannot be
+determined.
 @end defvar
 
 @defvar installation-directory