aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTino Calancha2017-05-24 10:54:48 +0900
committerTino Calancha2017-05-24 10:54:48 +0900
commit61ef5c612d05d62b2190870ea7289251c3e092c6 (patch)
tree77dc5c9769bd88394bf1a47eac7d1bca5f5e5b13
parent2389ba2ebec4123453796dc5ebbb6452a17ddd92 (diff)
downloademacs-61ef5c612d05d62b2190870ea7289251c3e092c6.tar.gz
emacs-61ef5c612d05d62b2190870ea7289251c3e092c6.zip
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.
-rw-r--r--lisp/vc/ediff-ptch.el2
1 files changed, 1 insertions, 1 deletions
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."
229 "/dev/null"))) 229 "/dev/null")))
230 ;; Remove file junk (Bug#26084). 230 ;; Remove file junk (Bug#26084).
231 (while (re-search-backward 231 (while (re-search-backward
232 (concat "^" diff-file-junk-re) mark1-end t) 232 (concat "^\\(?:" diff-file-junk-re "\\)") mark1-end t)
233 (move-marker mark2 (match-beginning 0))) 233 (move-marker mark2 (match-beginning 0)))
234 (goto-char mark2-end) 234 (goto-char mark2-end)
235 (if filenames 235 (if filenames