Variable: ediff-context-diff-label-regexp

ediff-context-diff-label-regexp is a customizable variable defined in ediff-ptch.el.gz.

Value

"\\(^\\*\\*\\* +\\([^   \n]+\\)[^*]+\n--- +\\([^        \n]+\\)\\|^--- +\\([^   \n]+\\).*\n\\+\\+\\+ +\\([^     \n]+\\)\\)"

Documentation

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 program.

Source Code

;; Defined in /usr/src/emacs/lisp/vc/ediff-ptch.el.gz
;; This context diff does not recognize spaces inside files, but removing ' '
;; from [^ \t] breaks normal patches for some reason
(defcustom ediff-context-diff-label-regexp
  (let ((stuff "\\([^ \t\n]+\\)"))
    (concat "\\("       ; context diff 2-liner
            "^\\*\\*\\* +" stuff "[^*]+\n--- +" stuff
            "\\|"       ; unified format diff 2-liner
            "^--- +" stuff ".*\n\\+\\+\\+ +" stuff
            "\\)"))
  "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
program."
  :type 'regexp)