diff options
| author | Tino Calancha <tino.calancha@gmail.com> | 2017-03-21 17:25:55 +0900 |
|---|---|---|
| committer | Tino Calancha <tino.calancha@gmail.com> | 2017-03-21 17:25:55 +0900 |
| commit | abe731eef0fcbc59ef4836e06f6099ea17042b90 (patch) | |
| tree | 6611bae15f92a0451acf7ce02128cab09d6dfb95 /lisp/vc/diff-mode.el | |
| parent | 205223f4725864e1fb53df5cd12694d0bc89f7d0 (diff) | |
| download | emacs-abe731eef0fcbc59ef4836e06f6099ea17042b90.tar.gz | |
epatch: Save right backups in Git multipatches
Multipatches on N Git files save wrong backups for
N-1 files; only the last one has a correct backup (Bug#26084).
* lisp/vc/diff-mode.el (diff-file-junk-re): Add 'Prereq: '
* lisp/vc/ediff-ptch.el (ediff-map-patch-buffer): Use 'diff-file-junk-re'.
* test/lisp/vc/ediff-ptch-tests.el (ediff-ptch-test-bug25010):
Rename from ibuffer-test-bug25010.
(ediff-ptch-test-bug26084): New test.
Diffstat (limited to 'lisp/vc/diff-mode.el')
| -rw-r--r-- | lisp/vc/diff-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 31c33e6a720..aa8d77882ec 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -504,7 +504,7 @@ See http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01990.html") ;; "index ", "old mode", "new mode", "new file mode" and ;; "deleted file mode" are output by git-diff. (defconst diff-file-junk-re - (concat "Index: \\|=\\{20,\\}\\|" ; SVN + (concat "Index: \\|Prereq: \\|=\\{20,\\}\\|" ; SVN "diff \\|index \\|\\(?:deleted file\\|new\\(?: file\\)?\\|old\\) mode\\|=== modified file")) ;; If point is in a diff header, then return beginning |