From: Juri Linkov <juri@linkov.net>
Date: Mon, 25 Mar 2024 07:45:08 +0000 (+0200)
Subject: * lisp/vc/diff-mode.el (diff-setup-buffer-type): Remove "\n" from regexp.
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7047c7867c140450b2a04e204b58515fc560c596;p=emacs.git

* lisp/vc/diff-mode.el (diff-setup-buffer-type): Remove "\n" from regexp.

Remove extra "\n" from the end of the "diff --git.*" part
of 'diff-outline-regexp' because "\n" is not used in outline-regexp
and causes problems in such cases like when killing hunks
in the diff buffer with outline-minor-mode that loses
the outline icons because outline--fix-buttons-after-change and
outline--fix-up-all-buttons are limited to the single line and
can't match an outline line with a regexp that ends with "\n".

(cherry picked from commit f54b1d9f7b7a977ee4856c778a309c900ce9e8fa)
---

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 0f393ba86a2..66043059d14 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1619,7 +1619,7 @@ modified lines of the diff."
                   nil)))
   (when (eq diff-buffer-type 'git)
     (setq diff-outline-regexp
-          (concat "\\(^diff --git.*\n\\|" diff-hunk-header-re "\\)")))
+          (concat "\\(^diff --git.*\\|" diff-hunk-header-re "\\)")))
   (setq-local outline-level #'diff--outline-level)
   (setq-local outline-regexp diff-outline-regexp))