diff options
| author | Andreas Schwab | 1999-08-27 07:59:22 +0000 |
|---|---|---|
| committer | Andreas Schwab | 1999-08-27 07:59:22 +0000 |
| commit | 051848e4984093ff3dd61d344bf65a8946d6f734 (patch) | |
| tree | 0cdf6745515a5a37634d37674f546e4c8be97d8c | |
| parent | 55ac4d11d177514359f6ff32d3e2268fce47f438 (diff) | |
| download | emacs-051848e4984093ff3dd61d344bf65a8946d6f734.tar.gz emacs-051848e4984093ff3dd61d344bf65a8946d6f734.zip | |
(vc-backend-merge-news): Fix regexp to also match P marker
from cvs update.
| -rw-r--r-- | lisp/vc.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 94c1a801634..3223aac601b 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> | 5 | ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> |
| 6 | ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> | 6 | ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> |
| 7 | 7 | ||
| 8 | ;; $Id: vc.el,v 1.249 1999/06/15 17:40:09 kwzh Exp $ | 8 | ;; $Id: vc.el,v 1.250 1999/06/30 07:16:14 spiegel Exp schwab $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -2995,7 +2995,7 @@ THRESHOLD, nil otherwise" | |||
| 2995 | (vc-file-setprop file 'vc-workfile-version (match-string 1))) | 2995 | (vc-file-setprop file 'vc-workfile-version (match-string 1))) |
| 2996 | ;; get file status | 2996 | ;; get file status |
| 2997 | (if (re-search-forward | 2997 | (if (re-search-forward |
| 2998 | (concat "^\\(\\([CMU]\\) \\)?" | 2998 | (concat "^\\(\\([CMUP]\\) \\)?" |
| 2999 | (regexp-quote (file-name-nondirectory file)) | 2999 | (regexp-quote (file-name-nondirectory file)) |
| 3000 | "\\( already contains the differences between \\)?") | 3000 | "\\( already contains the differences between \\)?") |
| 3001 | nil t) | 3001 | nil t) |