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

7 files changed, 52 insertions, 26 deletions

diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 1a85f96df48..0b730e27d30 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1044,8 +1044,10 @@ auto-save-mode}.
   If you want auto-saving to be done in the visited file rather than
 in a separate auto-save file, set the variable
 @code{auto-save-visited-file-name} to a non-@code{nil} value.  In this
-mode, there is no real difference between auto-saving and explicit
-saving.
+mode, auto-saving is very similar to explicit saving.  However,
+differences still exist, in particular for modes which modify the
+buffer-saving process in non-trivial ways via various hooks
+(@pxref{Saving Buffers,,, elisp, The Emacs Lisp Reference Manual}).
 
 @vindex delete-auto-save-files
   A buffer's auto-save file is deleted when you save the buffer in its
diff --git a/doc/lispref/backups.texi b/doc/lispref/backups.texi
index 7b6f0845aeb..3e2d1f62483 100644
--- a/doc/lispref/backups.texi
+++ b/doc/lispref/backups.texi
@@ -550,6 +550,11 @@ effect in an existing buffer until the next time auto-save mode is
 reenabled in it.  If auto-save mode is already enabled, auto-saves
 continue to go in the same file name until @code{auto-save-mode} is
 called again.
+
+Note that setting this variable to a non-@code{nil} value does not
+change the fact that auto-saving is different from saving the buffer;
+e.g., the hooks described in @ref{Saving Buffers} are @emph{not} run
+when a buffer is auto-saved.
 @end defopt
 
 @defun recent-auto-save-p
diff --git a/doc/lispref/compile.texi b/doc/lispref/compile.texi
index b1cc04be09d..201d9fc2fa5 100644
--- a/doc/lispref/compile.texi
+++ b/doc/lispref/compile.texi
@@ -88,10 +88,14 @@ the @code{byte-compile} function.  You can compile a whole file with
 @code{byte-compile-file}, or several files with
 @code{byte-recompile-directory} or @code{batch-byte-compile}.
 
+@vindex byte-compile-debug
   Sometimes, the byte compiler produces warning and/or error messages
-(@pxref{Compiler Errors}, for details).  These messages are recorded
-in a buffer called @file{*Compile-Log*}, which uses Compilation mode.
-@xref{Compilation Mode,,,emacs, The GNU Emacs Manual}.
+(@pxref{Compiler Errors}, for details).  These messages are normally
+recorded in a buffer called @file{*Compile-Log*}, which uses
+Compilation mode.  @xref{Compilation Mode,,,emacs, The GNU Emacs
+Manual}.  However, if the variable @code{byte-compile-debug} is
+non-nil, error message will be signaled as Lisp errors instead
+(@pxref{Errors}).
 
 @cindex macro compilation
   Be careful when writing macro calls in files that you intend to
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index ef373211415..2b692dbf680 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -408,7 +408,11 @@ buffer name instead.
 @end deffn
 
   Saving a buffer runs several hooks.  It also performs format
-conversion (@pxref{Format Conversion}).
+conversion (@pxref{Format Conversion}).  Note that these hooks,
+described below, are only run by @code{save-buffer}, they are not run
+by other primitives and functions that write buffer text to files, and
+in particular auto-saving (@pxref{Auto-Saving}) doesn't run these
+hooks.
 
 @defvar write-file-functions
 The value of this variable is a list of functions to be called before
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index cf47db4a814..ae2b31c5418 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -901,17 +901,18 @@ Functions}).  Thus, strings are enclosed in @samp{"} characters, and
 @item %o
 @cindex integer to octal
 Replace the specification with the base-eight representation of an
-integer.
+unsigned integer.
 
 @item %d
-Replace the specification with the base-ten representation of an
+Replace the specification with the base-ten representation of a signed
 integer.
 
 @item %x
 @itemx %X
 @cindex integer to hexadecimal
 Replace the specification with the base-sixteen representation of an
-integer.  @samp{%x} uses lower case and @samp{%X} uses upper case.
+unsigned integer.  @samp{%x} uses lower case and @samp{%X} uses upper
+case.
 
 @item %c
 Replace the specification with the character which is the value given.
@@ -926,8 +927,12 @@ floating-point number.
 
 @item %g
 Replace the specification with notation for a floating-point number,
-using either exponential notation or decimal-point notation, whichever
-is shorter.
+using either exponential notation or decimal-point notation.  The
+exponential notation is used if the exponent would be less than -4 or
+greater than or equal to the precision (default: 6).  By default,
+trailing zeros are removed from the fractional portion of the result
+and a decimal-point character appears only if it is followed by a
+digit.
 
 @item %%
 Replace the specification with a single @samp{%}.  This format
@@ -1008,9 +1013,11 @@ both flags are used, @samp{+} takes precedence.
   The flag @samp{#} specifies an alternate form which depends on
 the format in use.  For @samp{%o}, it ensures that the result begins
 with a @samp{0}.  For @samp{%x} and @samp{%X}, it prefixes the result
-with @samp{0x} or @samp{0X}.  For @samp{%e}, @samp{%f}, and @samp{%g},
-the @samp{#} flag means include a decimal point even if the precision
-is zero.
+with @samp{0x} or @samp{0X}.  For @samp{%e} and @samp{%f}, the
+@samp{#} flag means include a decimal point even if the precision is
+zero.  For @samp{%g}, it always includes a decimal point, and also
+forces any trailing zeros after the decimal point to be left in place
+where they would otherwise be removed.
 
   The flag @samp{0} ensures that the padding consists of @samp{0}
 characters instead of spaces.  This flag is ignored for non-numerical
@@ -1041,10 +1048,14 @@ ignored.
   All the specification characters allow an optional @dfn{precision}
 before the character (after the width, if present).  The precision is
 a decimal-point @samp{.} followed by a digit-string.  For the
-floating-point specifications (@samp{%e}, @samp{%f}, @samp{%g}), the
-precision specifies how many decimal places to show; if zero, the
-decimal-point itself is also omitted.  For @samp{%s} and @samp{%S},
-the precision truncates the string to the given width, so @samp{%.3s}
+floating-point specifications (@samp{%e} and @samp{%f}), the
+precision specifies how many digits following the decimal point to
+show; if zero, the decimal-point itself is also omitted.  For
+@samp{%g}, the precision specifies how many significant digits to show
+(significant digits are the first digit before the decimal point and
+all the digits after it).  If the precision of %g is zero or
+unspecified, it is treated as 1.  For @samp{%s} and @samp{%S}, the
+precision truncates the string to the given width, so @samp{%.3s}
 shows only the first three characters of the representation for
 @var{object}.  For other specification characters, the effect of
 precision is what the local library functions of the @code{printf}
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