aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2018-12-25 23:49:13 +0200
committerJuri Linkov2018-12-25 23:49:13 +0200
commitf360cf9843fb56d1690cf94bdfe435ba740a992e (patch)
tree9378bc65c737ecef80319461b33f4273a9a101b2
parent9916410fa8bc765677e2d09384599aa85945967d (diff)
downloademacs-f360cf9843fb56d1690cf94bdfe435ba740a992e.tar.gz
emacs-f360cf9843fb56d1690cf94bdfe435ba740a992e.zip
* lisp/vc/diff-mode.el (diff-syntax-fontify-hunk): Add `*' to names
of ephemeral buffers like in " *org-src-fontification:%s*" from `org-src-font-lock-fontify-block'. (Bug#33567) (diff-header, diff-file-header): Tone down light background colors.
-rw-r--r--lisp/vc/diff-mode.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index dd3a04b4e75..7b37bed7ae8 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -272,7 +272,7 @@ well."
272 272
273(defface diff-header 273(defface diff-header
274 '((((class color) (min-colors 88) (background light)) 274 '((((class color) (min-colors 88) (background light))
275 :background "grey80") 275 :background "grey85")
276 (((class color) (min-colors 88) (background dark)) 276 (((class color) (min-colors 88) (background dark))
277 :background "grey45") 277 :background "grey45")
278 (((class color)) 278 (((class color))
@@ -282,7 +282,7 @@ well."
282 282
283(defface diff-file-header 283(defface diff-file-header
284 '((((class color) (min-colors 88) (background light)) 284 '((((class color) (min-colors 88) (background light))
285 :background "grey70" :weight bold) 285 :background "grey75" :weight bold)
286 (((class color) (min-colors 88) (background dark)) 286 (((class color) (min-colors 88) (background dark))
287 :background "grey60" :weight bold) 287 :background "grey60" :weight bold)
288 (((class color)) 288 (((class color))
@@ -2434,7 +2434,7 @@ When OLD is non-nil, highlight the hunk from the old source."
2434 (insert-file-contents file t) 2434 (insert-file-contents file t)
2435 (setq props (diff-syntax-fontify-props file text line-nb))))) 2435 (setq props (diff-syntax-fontify-props file text line-nb)))))
2436 ;; Get properties from a cached revision 2436 ;; Get properties from a cached revision
2437 (let* ((buffer-name (format " diff-syntax:%s.~%s~" 2437 (let* ((buffer-name (format " *diff-syntax:%s.~%s~*"
2438 (expand-file-name file) revision)) 2438 (expand-file-name file) revision))
2439 (buffer (gethash buffer-name diff-syntax-fontify-revisions))) 2439 (buffer (gethash buffer-name diff-syntax-fontify-revisions)))
2440 (unless (and buffer (buffer-live-p buffer)) 2440 (unless (and buffer (buffer-live-p buffer))