procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Revert "Fix fontification in diff--font-lock-prettify""

Browse source 
This reverts commit 3cadd72673.
This commit is contained in:
Tassilo Horn 2021-12-29 18:00:52 +01:00
parent 3cadd72673
commit 7715fb3eff
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lisp/vc/diff-mode.el
View file

@ -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