diff options
| author | Juri Linkov <juri@linkov.net> | 2019-04-08 23:34:20 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2019-04-08 23:34:20 +0300 |
| commit | 0667c73708e3c8ed886a4ab0c220fd13908059e5 (patch) | |
| tree | 7971c2ea69095d0bd993a348bca6d1bb1ad92ac2 /lisp | |
| parent | a038df77de7b1aa2d73a6478493b8838b59e4982 (diff) | |
| download | emacs-0667c73708e3c8ed886a4ab0c220fd13908059e5.tar.gz | |
* lisp/vc/diff-mode.el (diff-syntax-fontify-props): Check both buffer-local
and default value of find-file-hook.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/vc/diff-mode.el | 3 |
1 files changed, 2 insertions, 1 deletions
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)))) |