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, 27 insertions, 18 deletions

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 7cbef8e4340..f45ae359f6c 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -416,7 +416,8 @@ specify different fields to sort on."
   :type '(choice (const name) (const callers) (const calls)
 		 (const calls+callers) (const nil)))
 
-(defvar byte-compile-debug nil)
+(defvar byte-compile-debug nil
+  "If non-nil, byte compile errors will be raised as signals instead of logged.")
 (defvar byte-compile-jump-tables nil
   "List of all jump tables used during compilation of this form.")
 (defvar byte-compile-constants nil
diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el
index bba7b83a792..482b579f11a 100644
--- a/lisp/emacs-lisp/cl-preloaded.el
+++ b/lisp/emacs-lisp/cl-preloaded.el
@@ -45,7 +45,7 @@
 
 (defun cl--assertion-failed (form &optional string sargs args)
   (if debug-on-error
-      (funcall debugger `(cl-assertion-failed ,form ,string ,@sargs))
+      (funcall debugger 'error `(cl-assertion-failed (,form ,string ,@sargs)))
     (if string
         (apply #'error string (append sargs args))
       (signal 'cl-assertion-failed `(,form ,@sargs)))))
diff --git a/lisp/files.el b/lisp/files.el
index c7de4453d75..0a023a88b10 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -439,7 +439,8 @@ functions are called."
 
 (define-obsolete-variable-alias 'write-file-hooks 'write-file-functions "22.1")
 (defvar write-file-functions nil
-  "List of functions to be called before writing out a buffer to a file.
+  "List of functions to be called before saving a buffer to a file.
+Only used by `save-buffer'.
 If one of them returns non-nil, the file is considered already written
 and the rest are not called.
 These hooks are considered to pertain to the visited file.
@@ -464,6 +465,7 @@ updates before the buffer is saved, use `before-save-hook'.")
     'write-contents-functions "22.1")
 (defvar write-contents-functions nil
   "List of functions to be called before writing out a buffer to a file.
+Only used by `save-buffer'.
 If one of them returns non-nil, the file is considered already written
 and the rest are not called and neither are the functions in
 `write-file-functions'.
@@ -4855,13 +4857,15 @@ the last real save, but optional arg FORCE non-nil means delete anyway."
   "Normal hook run just before auto-saving.")
 
 (defcustom before-save-hook nil
-  "Normal hook that is run before a buffer is saved to its file."
+  "Normal hook that is run before a buffer is saved to its file.
+Only used by `save-buffer'."
   :options '(copyright-update time-stamp)
   :type 'hook
   :group 'files)
 
 (defcustom after-save-hook nil
-  "Normal hook that is run after a buffer is saved to its file."
+  "Normal hook that is run after a buffer is saved to its file.
+Only used by `save-buffer'."
   :options '(executable-make-buffer-file-executable-if-script-p)
   :type 'hook
   :group 'files)
diff --git a/lisp/net/mailcap.el b/lisp/net/mailcap.el
index 4e53b5a2861..89f6c91156b 100644
--- a/lisp/net/mailcap.el
+++ b/lisp/net/mailcap.el
@@ -853,7 +853,7 @@ If NO-DECODE is non-nil, don't decode STRING."
     (".css"   . "text/css")
     (".dvi"   . "application/x-dvi")
     (".diff"  . "text/x-patch")
-    (".dpatch". "test/x-patch")
+    (".dpatch". "text/x-patch")
     (".el"    . "application/emacs-lisp")
     (".eps"   . "application/postscript")
     (".etx"   . "text/x-setext")
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 0e82cfda7b8..caa6526435b 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/org-src.el
@@ -914,16 +914,20 @@ fontification of code blocks see `org-src-fontify-block' and
 	  (with-current-buffer
 	      (get-buffer-create
 	       (concat " org-src-fontification:" (symbol-name lang-mode)))
-	    (delete-region (point-min) (point-max))
-	    (insert string " ") ;; so there's a final property change
-	    (unless (eq major-mode lang-mode) (funcall lang-mode))
-            (org-font-lock-ensure)
-	    (setq pos (point-min))
-	    (while (setq next (next-single-property-change pos 'face))
-	      (put-text-property
-	       (+ start (1- pos)) (1- (+ start next)) 'face
-	       (get-text-property pos 'face) org-buffer)
-	      (setq pos next)))
+            ;; Make sure that modification hooks are not inhibited in
+            ;; the org-src-fontification buffer in case we're called
+            ;; from `jit-lock-function' (Bug#25132).
+            (let ((inhibit-modification-hooks nil))
+              (delete-region (point-min) (point-max))
+              (insert string " ") ;; so there's a final property change
+              (unless (eq major-mode lang-mode) (funcall lang-mode))
+              (org-font-lock-ensure)
+              (setq pos (point-min))
+              (while (setq next (next-single-property-change pos 'face))
+                (put-text-property
+                 (+ start (1- pos)) (1- (+ start next)) 'face
+                 (get-text-property pos 'face) org-buffer)
+                (setq pos next))))
 	  (add-text-properties
 	   start end
 	   '(font-lock-fontified t fontified t font-lock-multiline t))
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index e488c196fef..ed34d9aaa52 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -363,7 +363,7 @@ instead of SOURCE-FILE-NAME.
 
 For example, foo.cpp is a master file if it includes foo.h.
 
-Whether a buffer for MATER-FILE-NAME exists, use it as a source
+When a buffer for MASTER-FILE-NAME exists, use it as a source
 instead of reading master file from disk."
   (let* ((source-file-nondir (file-name-nondirectory source-file-name))
          (source-file-extension (file-name-extension source-file-nondir))
diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el
index 2567818de65..d7fa74fff87 100644
--- a/lisp/vc/ediff-merg.el
+++ b/lisp/vc/ediff-merg.el
@@ -84,7 +84,7 @@ A region is considered to have been changed if it is different from the current
 default (`default-A', `default-B', `combined') and it hasn't been marked as
 `prefer-A' or `prefer-B'.
 A region is considered to have been changed also when it is marked as
-as `prefer-A', but is different from the corresponding difference region in
+`prefer-A', but is different from the corresponding difference region in
 Buffer A or if it is marked as `prefer-B' and is different from the region in
 Buffer B."
   :type 'boolean