From: Tassilo Horn <tsdh@gnu.org>
Date: Wed, 29 Dec 2021 17:00:52 +0000 (+0100)
Subject: Revert "Revert "Fix fontification in diff--font-lock-prettify""
X-Git-Tag: emacs-29.0.90~3363
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7715fb3eff59102487e37fba5fc0d421dc8b9a51;p=emacs.git
Revert "Revert "Fix fontification in diff--font-lock-prettify""
This reverts commit 3cadd72673d8095df7eeb8e847db87ae42b5e2f6.
---
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 8f83aa580e4..60d210ca220 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -2612,19 +2612,17 @@ fixed, visit it in a buffer."
"\\(?:index.*\n\\)?"
"--- \\(?:" null-device "\\|a/\\(.*\\)\\)\n"
"\\+\\+\\+ \\(?:" null-device "\\|b/\\(.*\\)\\)\n"))))
- (put-text-property (match-beginning 0)
- (or (match-beginning 2) (match-beginning 1))
- 'display (propertize
- (cond
- ((null (match-beginning 1))
- (concat "new file " (match-string 2)))
- ((null (match-beginning 2))
- (concat "deleted " (match-string 1)))
- (t
- (concat "modified " (match-string 1))))
- 'face '(diff-file-header diff-header)))
- (put-text-property (match-end 1) (1- (match-end 0))
- 'display ""))))
+ (put-text-property (match-beginning 0) (1- (match-end 0))
+ 'display
+ (propertize
+ (cond
+ ((null (match-string 1))
+ (concat "new file " (match-string 2)))
+ ((null (match-string 2))
+ (concat "deleted " (match-string 1)))
+ (t
+ (concat "modified " (match-string 1))))
+ 'face '(diff-file-header diff-header))))))
nil)
;;; Syntax highlighting from font-lock