From 61ef5c612d05d62b2190870ea7289251c3e092c6 Mon Sep 17 00:00:00 2001 From: Tino Calancha Date: Wed, 24 May 2017 10:54:48 +0900 Subject: [PATCH] Fix concatenation of "^" with diff-file-junk-re This regexp contains "\\|", thus a concatenation of "^" with it just matches the beginning of line for the first alternative in diff-file-junk-re. * lisp/vc/ediff-ptch.el (ediff-map-patch-buffer): Concat "^" with diff-file-junk-re wrapped in a shy group. --- lisp/vc/ediff-ptch.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el index 0340672da2f..6c8e925d2b9 100644 --- a/lisp/vc/ediff-ptch.el +++ b/lisp/vc/ediff-ptch.el @@ -229,7 +229,7 @@ program." "/dev/null"))) ;; Remove file junk (Bug#26084). (while (re-search-backward - (concat "^" diff-file-junk-re) mark1-end t) + (concat "^\\(?:" diff-file-junk-re "\\)") mark1-end t) (move-marker mark2 (match-beginning 0))) (goto-char mark2-end) (if filenames -- 2.39.2