]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2389ba2) | patch
Fix concatenation of "^" with diff-file-junk-re
authorTino Calancha <tino.calancha@gmail.com>
Wed, 24 May 2017 01:54:48 +0000 (10:54 +0900)
committerTino Calancha <tino.calancha@gmail.com>
Wed, 24 May 2017 01:54:48 +0000 (10:54 +0900)
commit61ef5c612d05d62b2190870ea7289251c3e092c6
tree77dc5c9769bd88394bf1a47eac7d1bca5f5e5b13tree | snapshot
parent2389ba2ebec4123453796dc5ebbb6452a17ddd92commit | diff
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 diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.