From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 29 Jun 2022 15:47:24 +0000 (-0400)
Subject: * lisp/vc/diff-mode.el (diff--font-lock-prettify): Fix `diff-buffers` case
X-Git-Tag: emacs-29.0.90~1447^2~1372
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aee101af911655ff3dd7a4e032ee5366ce533578;p=emacs.git

* lisp/vc/diff-mode.el (diff--font-lock-prettify): Fix `diff-buffers` case
---

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 0fd67422d55..3f3e503a3f3 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -2682,7 +2682,17 @@ fixed, visit it in a buffer."
                    ((and (null (match-string 4)) (match-string 5))
                     (concat "New " kind filemode newfile))
                    ((null (match-string 2))
-                    (concat "Deleted" kind filemode oldfile))
+                    ;; We used to use
+                    ;;     (concat "Deleted" kind filemode oldfile)
+                    ;; here but that misfires for `diff-buffers'
+                    ;; (see 24 Jun 2022 message in bug#54034).
+                    ;; AFAIK if (match-string 2) is nil then so is
+                    ;; (match-string 1), so "Deleted" doesn't sound right,
+                    ;; so better just let the header in plain sight for now.
+                    ;; FIXME: `diff-buffers' should maybe try to better
+                    ;; mimic Git's format with "a/" and "b/" so prettification
+                    ;; can "just work!"
+                    nil)
                    (t
                     (concat "Modified" kind filemode oldfile)))
                   'face '(diff-file-header diff-header))