From: Juri Linkov <juri@linkov.net>
Date: Mon, 8 Apr 2019 20:34:20 +0000 (+0300)
Subject: * lisp/vc/diff-mode.el (diff-syntax-fontify-props): Check both buffer-local
X-Git-Tag: emacs-27.0.90~3261^2~68
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0667c73708e3c8ed886a4ab0c220fd13908059e5;p=emacs.git

* 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 dbde284da84..840f2c67d20 100644
--- 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))))