[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 8e90216389: * lisp/vc/diff-mode.el (diff--font-lock-prettify): Re
From: |
Stefan Monnier |
Subject: |
master 8e90216389: * lisp/vc/diff-mode.el (diff--font-lock-prettify): Recognize mode changes |
Date: |
Mon, 21 Feb 2022 18:53:08 -0500 (EST) |
branch: master
commit 8e90216389feafb7391c56f8d8441562eaa13c9d
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
* lisp/vc/diff-mode.el (diff--font-lock-prettify): Recognize mode changes
---
lisp/vc/diff-mode.el | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index c28321e473..511cc89778 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -2636,6 +2636,7 @@ fixed, visit it in a buffer."
" and " file5 " \\(?7:differ\\)\n"))
(horb (concat "\\(?:" header "\\|" binary "\\)")))
(concat "diff.*?\\(?: a/\\(.*?\\) b/\\(.*\\)\\)?\n"
+ "\\(?:\\(?:old\\|new\\) mode .*\n\\)*"
"\\(?:"
;; For new/deleted files, there might be no
;; header (and no hunk) if the file is/was empty.
@@ -2647,6 +2648,8 @@ fixed, visit it in a buffer."
;; or from the two header lines. Prefer the header line info if
;; available since the `diff' line is ambiguous in case the
;; file names include " b/" or " a/".
+ ;; FIXME: This prettification throws away all the information
+ ;; about file modes (and the index hashes).
(let ((oldfile (or (match-string 4) (match-string 1)))
(newfile (or (match-string 5) (match-string 2)))
(kind (if (match-beginning 7) " BINARY"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 8e90216389: * lisp/vc/diff-mode.el (diff--font-lock-prettify): Recognize mode changes,
Stefan Monnier <=