* lisp/vc/diff-mode.el (diff-syntax-fontify-props): Check both buffer-local

and default value of find-file-hook.

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index dbde284da84c15ea718ae068e408685feff60554..840f2c67d20ed067dc99675fff6286207d6832f3 100644 (file)
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -2529,7 +2529,8 @@ hunk text is not found in the source file."
     (let ((enable-local-variables :safe) ;; to find `mode:'
           (buffer-file-name file))
       (set-auto-mode)
-      (when (and (memq 'generic-mode-find-file-hook find-file-hook)
+      (when (and (memq 'generic-mode-find-file-hook
+                       (append find-file-hook (default-value 'find-file-hook)))
                  (fboundp 'generic-mode-find-file-hook))
         (generic-mode-find-file-hook))))