diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 1997-11-25 02:10:08 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 1997-11-25 02:10:08 +0000 |
| commit | 72f42d2cb00325f991e6df3938435f44dde68ab4 (patch) | |
| tree | daf4ef42563a84486cfe7302330eaee9fb2f5108 /lisp/ediff-diff.el | |
| parent | f7c9880abdaccdec6d8e788324946202133041e1 (diff) | |
| download | emacs-72f42d2cb00325f991e6df3938435f44dde68ab4.tar.gz | |
new version
Diffstat (limited to 'lisp/ediff-diff.el')
| -rw-r--r-- | lisp/ediff-diff.el | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el index a12959eea12..e773ba44e04 100644 --- a/lisp/ediff-diff.el +++ b/lisp/ediff-diff.el @@ -133,14 +133,24 @@ Use `setq-default' if setting it in .emacs") ;;; General (defvar ediff-diff-ok-lines-regexp - "^\\([0-9,]+[acd][0-9,]+$\\|[<>] \\|---\\|.*Warning *:\\|.*No +newline\\|.*missing +newline\\|^\C-m$\\)" + (concat + "^\\(" + "[0-9,]+[acd][0-9,]+\C-m?$" + "\\|[<>] " + "\\|---" + "\\|.*Warning *:" + "\\|.*No +newline" + "\\|.*missing +newline" + "\\|^\C-m?$" + "\\)") "Regexp that matches normal output lines from `ediff-diff-program'. This is mostly lifted from Emerge, except that Ediff also considers warnings and `Missing newline'-type messages to be normal output. Lines that do not match are assumed to be error messages.") -(defvar ediff-match-diff-line (let ((x "\\([0-9]+\\)\\(\\|,\\([0-9]+\\)\\)")) - (concat "^" x "\\([acd]\\)" x "$")) +(defvar ediff-match-diff-line + (let ((x "\\([0-9]+\\)\\(\\|,\\([0-9]+\\)\\)")) + (concat "^" x "\\([acd]\\)" x "\C-m?$")) "Pattern to match lines produced by diff that describe differences.") (ediff-defvar-local ediff-setup-diff-regions-function nil |