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, 7 insertions, 6 deletions

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 9a350aadaca..53fa15d4199 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -547,8 +547,8 @@ name (a symbol) and DESC is a `package--bi-desc' structure.")
 (defvar package-alist nil
   "Alist of all packages available for activation.
 Each element has the form (PKG . DESCS), where PKG is a package
-name (a symbol) and DESCS is a non-empty list of `package-desc' structure,
-sorted by decreasing versions.
+name (a symbol) and DESCS is a non-empty list of `package-desc'
+structures, sorted by decreasing versions.
 
 This variable is set automatically by `package-load-descriptor',
 called via `package-initialize'.  To change which packages are
diff --git a/lisp/term.el b/lisp/term.el
index dec8f5a3178..f3411044b25 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -2916,11 +2916,12 @@ See `term-prompt-regexp'."
                 (when (= funny str-length)
                   (let ((partial 0)
                         (count (length decoded-substring)))
-                    (while (eq (char-charset (aref decoded-substring
-                                                   (- count 1 partial)))
-                               'eight-bit)
+                    (while (and (< partial count)
+                                (eq (char-charset (aref decoded-substring
+                                                        (- count 1 partial)))
+                                    'eight-bit))
                       (cl-incf partial))
-                    (when (> partial 0)
+                    (when (> count partial 0)
                       (setq term-terminal-undecoded-bytes
                             (substring decoded-substring (- partial)))
                       (setq decoded-substring