From ff6f4585eedbefea245ec597e96217271b6fe2d2 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Mon, 14 Dec 2009 06:52:59 +0000 Subject: [PATCH] (ediff-context-diff-label-regexp): Don't match whitespace after the file name of the first line of unified format, because git-diff doesn't output whitespace and file modification time after the file name. --- lisp/ChangeLog | 7 +++++++ lisp/ediff-ptch.el | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2015c5356cf..df0a394aa66 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2009-12-14 Juri Linkov + + * ediff-ptch.el (ediff-context-diff-label-regexp): Don't match + whitespace after the file name of the first line of unified format, + because git-diff doesn't output whitespace and file modification time + after the file name. + 2009-12-14 David Kastrup * info.el (Info-hide-cookies-node): Before hiding a cookie, diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el index 9ae663df68d..9d4d3350a32 100644 --- a/lisp/ediff-ptch.el +++ b/lisp/ediff-ptch.el @@ -126,8 +126,8 @@ patch. So, don't change these variables, unless the default doesn't work." (defcustom ediff-context-diff-label-regexp (concat "\\(" ; context diff 2-liner "^\\*\\*\\* +\\([^ \t]+\\)[^*]+[\t ]*\n--- +\\([^ \t]+\\)" - "\\|" ; GNU unified format diff 2-liner - "^--- +\\([^ \t]+\\)[\t ]+.*\n\\+\\+\\+ +\\([^ \t]+\\)" + "\\|" ; unified format diff 2-liner + "^--- +\\([^ \t]+\\).*\n\\+\\+\\+ +\\([^ \t]+\\)" "\\)") "Regexp matching filename 2-liners at the start of each context diff. You probably don't want to change that, unless you are using an obscure patch -- 2.39.2