diff options
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/ediff-ptch.el | 2 | ||||
| -rw-r--r-- | lisp/vc/pcvs-parse.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el index cb0ae6ff6e1..f6af5a45550 100644 --- a/lisp/vc/ediff-ptch.el +++ b/lisp/vc/ediff-ptch.el | |||
| @@ -119,7 +119,7 @@ patch. So, don't change these variables, unless the default doesn't work." | |||
| 119 | (defcustom ediff-context-diff-label-regexp | 119 | (defcustom ediff-context-diff-label-regexp |
| 120 | (let ((stuff "\\([^ \t\n]+\\)")) | 120 | (let ((stuff "\\([^ \t\n]+\\)")) |
| 121 | (concat "\\(" ; context diff 2-liner | 121 | (concat "\\(" ; context diff 2-liner |
| 122 | "^\\*\\*\\* +" stuff "[^*]+[\t ]*\n--- +" stuff | 122 | "^\\*\\*\\* +" stuff "[^*]+\n--- +" stuff |
| 123 | "\\|" ; unified format diff 2-liner | 123 | "\\|" ; unified format diff 2-liner |
| 124 | "^--- +" stuff ".*\n\\+\\+\\+ +" stuff | 124 | "^--- +" stuff ".*\n\\+\\+\\+ +" stuff |
| 125 | "\\)")) | 125 | "\\)")) |
diff --git a/lisp/vc/pcvs-parse.el b/lisp/vc/pcvs-parse.el index 466c621311f..dd56aec94a0 100644 --- a/lisp/vc/pcvs-parse.el +++ b/lisp/vc/pcvs-parse.el | |||
| @@ -472,7 +472,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." | |||
| 472 | ;; Let's not get all worked up if the format changes a bit | 472 | ;; Let's not get all worked up if the format changes a bit |
| 473 | (cvs-match " *Working revision:.*$")) | 473 | (cvs-match " *Working revision:.*$")) |
| 474 | (cvs-or | 474 | (cvs-or |
| 475 | (cvs-match " *RCS Version:[ \t]*\\([0-9.]+\\)[ \t]*.*$" (head-rev 1)) | 475 | (cvs-match " *RCS Version:[ \t]*\\([0-9.]+\\).*$" (head-rev 1)) |
| 476 | (cvs-match " *Repository revision:[ \t]*\\([0-9.]+\\)[ \t]*\\(.*\\)$" | 476 | (cvs-match " *Repository revision:[ \t]*\\([0-9.]+\\)[ \t]*\\(.*\\)$" |
| 477 | (head-rev 1)) | 477 | (head-rev 1)) |
| 478 | (cvs-match " *Repository revision:.*")) | 478 | (cvs-match " *Repository revision:.*")) |