diff options
| author | Juri Linkov <juri@linkov.net> | 2019-01-28 23:17:04 +0200 |
|---|---|---|
| committer | Juri Linkov <juri@linkov.net> | 2019-01-28 23:17:04 +0200 |
| commit | 137b65a9b0a4118adda50f34375b4960701542e9 (patch) | |
| tree | 16c27632bb169d08af5febb39c80df11d4fdb1cd /lisp/vc | |
| parent | 020f6233721661059990a4239b94cd7b64396f03 (diff) | |
| download | emacs-137b65a9b0a4118adda50f34375b4960701542e9.tar.gz emacs-137b65a9b0a4118adda50f34375b4960701542e9.tar.bz2 emacs-137b65a9b0a4118adda50f34375b4960701542e9.zip | |
Small fixes
* lisp/generic-x.el (etc-passwd-generic-mode): Add comment. (Bug#34225)
* lisp/vc/diff-mode.el (diff-syntax-fontify-hunk): Set overlay
property 'diff-mode to 'syntax. (Bug#33567)
(diff-syntax-fontify-props): Reset buffer-file-name to nil.
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/diff-mode.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 5d6cc6f38fb..158489c97fe 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -2488,6 +2488,7 @@ When OLD is non-nil, highlight the hunk from the old source." (let ((ol (make-overlay (+ bol (nth 0 prop)) (+ bol (nth 1 prop)) nil 'front-advance nil))) + (overlay-put ol 'diff-mode 'syntax) (overlay-put ol 'evaporate t) (overlay-put ol 'face (nth 2 prop)))))))))))) @@ -2502,6 +2503,7 @@ hunk text is not found in the source file." (unless no-init (buffer-disable-undo) (font-lock-mode -1) + (setq buffer-file-name nil) (let ((enable-local-variables :safe) ;; to find `mode:' (buffer-file-name file)) (set-auto-mode) |