From b299c042012c769280ede736907777e80b624ff0 Mon Sep 17 00:00:00 2001 From: Matthias Meulien Date: Mon, 14 Feb 2022 22:29:49 +0100 Subject: [PATCH] Fix computation of outline heading level for non-git diff * lisp/vc/diff-mode.el (diff-setup-buffer-type): Compute outline heading level using diff-hunk-header-re (bug#51809). (diff--font-lock-prettify): Disable prettify in non-git diff. --- lisp/vc/diff-mode.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 0bf78992460..d0c05d32044 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -1596,8 +1596,8 @@ modified lines of the diff." nil))) (when (eq diff-buffer-type 'git) (setq diff-outline-regexp - (concat "\\(^diff --git.*\n\\|" diff-hunk-header-re "\\)")) - (setq-local outline-level #'diff--outline-level)) + (concat "\\(^diff --git.*\n\\|" diff-hunk-header-re "\\)"))) + (setq-local outline-level #'diff--outline-level) (setq-local outline-regexp diff-outline-regexp)) (defun diff-delete-if-empty () @@ -2599,7 +2599,8 @@ fixed, visit it in a buffer." nil nil 'center) (defun diff--font-lock-prettify (limit) - (when diff-font-lock-prettify + (when (and diff-font-lock-prettify + (eq diff-buffer-type 'git)) (save-excursion ;; FIXME: Include the first space for context-style hunks! (while (re-search-forward "^[-+! ]" limit t) -- 2.39.5