Merge from emacs-26

150bdfe43a Handle completely undecoded input in term (Bug#29918)
021f32cca1 * doc/misc/forms.texi (Control File Format): Fix a doc error.
76538d09b7 Fix typo in package-alist docstring
b2fde4b5e8 * doc/lispref/text.texi (Mode-Specific Indent): Fix a typo...
7e62778548 ; Another minor change in 'bidi-display-reordering's doc s...
4455ddbe56 Improve doc string of 'bidi-display-reordering'
34ee26dd93 Add warning to bidi-display-reordering doc string

# Conflicts:
#	lisp/term.el
#	test/lisp/term-tests.el

2 files changed, 2 insertions, 2 deletions

diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index e73141faf4c..7ce54f59c69 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -2344,7 +2344,7 @@ Here is what it does:
 @itemize
 @item
 First, it checks whether Transient Mark mode is enabled and the region
-is active.  If so, it called @code{indent-region} to indent all the
+is active.  If so, it calls @code{indent-region} to indent all the
 text in the region (@pxref{Region Indent}).
 
 @item
diff --git a/doc/misc/forms.texi b/doc/misc/forms.texi
index d669ed6d038..9423f946091 100644
--- a/doc/misc/forms.texi
+++ b/doc/misc/forms.texi
@@ -431,7 +431,7 @@ file.  Example:
 If the control file does not set @code{forms-format-list} a default
 format is used.  In this situation, Forms mode will deduce the number of
 fields from the data file providing this file exists and
-@code{forms-number-of-records} has not been set in the control file.
+@code{forms-number-of-fields} has not been set in the control file.
 
 The control file can optionally set the following additional Forms mode
 variables.  Most of them have default values that are good for most