procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix concatenation of "^" with diff-file-junk-re

Browse source 
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.
This commit is contained in:
Tino Calancha 2017-05-24 10:54:48 +09:00
parent 2389ba2ebe
commit 61ef5c612d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/vc/ediff-ptch.el
View file

@ -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