Merge from origin/emacs-25

ab0a60a ; * CONTRIBUTE (Generating ChangeLog entries): Drop duplicate...
7e02a47 Index byte-compile-debug
7c1e598 Document `byte-compile-debug' in the ELisp manual
4d81eb4 Document variable `byte-compile-debug'
72ef710 Fix call to debugger on assertion failure
ae8264c Call modification hooks in org-src fontify buffers
b3139da ; Fix last change in doc/lispref/strings.texi
c331f39 Improve documentation of 'format' conversions
9f52f67 Remove stale functions from ert manual
c416b14 Fix a typo in Eshell manual
06695a0 ; Fix a typo in ediff-merg.el
954e9e9 Improve documentation of hooks related to saving buffers
9fcab85 Improve documentation of auto-save-visited-file-name
2236c53 fix typo in mailcap-mime-extensions
85a3e4e Fix typos in flymake.el
a1ef10e More NEWS checking for admin.el's set-version

# Conflicts:
#	lisp/emacs-lisp/bytecomp.el

2 files changed, 8 insertions, 8 deletions

diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi
index b07cb0be490..4a2c29dcb9f 100644
--- a/doc/misc/ert.texi
+++ b/doc/misc/ert.texi
@@ -551,15 +551,15 @@ on their environment is easy.  Such tests often look like this:
 
 @lisp
 (ert-deftest ert-test-mismatch ()
-  (should (eql (ert--mismatch "" "") nil))
-  (should (eql (ert--mismatch "" "a") 0))
-  (should (eql (ert--mismatch "a" "a") nil))
-  (should (eql (ert--mismatch "ab" "a") 1))
-  (should (eql (ert--mismatch "Aa" "aA") 0))
-  (should (eql (ert--mismatch '(a b c) '(a b d)) 2)))
+  (should (eql (cl-mismatch "" "") nil))
+  (should (eql (cl-mismatch "" "a") 0))
+  (should (eql (cl-mismatch "a" "a") nil))
+  (should (eql (cl-mismatch "ab" "a") 1))
+  (should (eql (cl-mismatch "Aa" "aA") 0))
+  (should (eql (cl-mismatch '(a b c) '(a b d)) 2)))
 @end lisp
 
-This test calls the function @code{ert--mismatch} several times with
+This test calls the function @code{cl-mismatch} several times with
 various combinations of arguments and compares the return value to the
 expected return value.  (Some programmers prefer @code{(should (eql
 EXPECTED ACTUAL))} over the @code{(should (eql ACTUAL EXPECTED))}
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index bd89b9c5bf2..a7651b21d61 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -493,7 +493,7 @@ History I-search.
 @itemx M-n
 Previous and next history line.  If there is anything on the input
 line when you run these commands, they will instead jump to the
-precious or next line that begins with that string.
+previous or next line that begins with that string.
 @end table
 
 @node Completion