Commit 61ef5c61 authored by Tino Calancha's avatar Tino Calancha

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.
parent 2389ba2e
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment