* 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.

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index dd3a04b4e75164f65190a4eefffefc2c647626b7..7b37bed7ae8ea361113e808060ed5fbe8f5dbfa7 100644 (file)
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -272,7 +272,7 @@ well."
 
 (defface diff-header
   '((((class color) (min-colors 88) (background light))
-     :background "grey80")
+     :background "grey85")
     (((class color) (min-colors 88) (background dark))
      :background "grey45")
     (((class color))
@@ -282,7 +282,7 @@ well."
 
 (defface diff-file-header
   '((((class color) (min-colors 88) (background light))
-     :background "grey70" :weight bold)
+     :background "grey75" :weight bold)
     (((class color) (min-colors 88) (background dark))
      :background "grey60" :weight bold)
     (((class color))
@@ -2434,7 +2434,7 @@ When OLD is non-nil, highlight the hunk from the old source."
                       (insert-file-contents file t)
                       (setq props (diff-syntax-fontify-props file text line-nb)))))
               ;; Get properties from a cached revision
-              (let* ((buffer-name (format " diff-syntax:%s.~%s~"
+              (let* ((buffer-name (format " *diff-syntax:%s.~%s~*"
                                           (expand-file-name file) revision))
                      (buffer (gethash buffer-name diff-syntax-fontify-revisions)))
                 (unless (and buffer (buffer-live-p buffer))