# HG changeset patch
# User Andreas Schwab <schwab@suse.de>
# Date 935740762 0
# Node ID 9ade71ed068651d4d6b2007dcfa21ae851429e13
# Parent  456e2e2bc4d3ccab45fce34abad9e967d6ab2e90
(vc-backend-merge-news): Fix regexp to also match P marker
from cvs update.

diff -r 456e2e2bc4d3 -r 9ade71ed0686 lisp/vc.el
--- a/lisp/vc.el	Fri Aug 27 01:47:33 1999 +0000
+++ b/lisp/vc.el	Fri Aug 27 07:59:22 1999 +0000
@@ -5,7 +5,7 @@
 ;; Author:     Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
 
-;; $Id: vc.el,v 1.249 1999/06/15 17:40:09 kwzh Exp $
+;; $Id: vc.el,v 1.250 1999/06/30 07:16:14 spiegel Exp schwab $
 
 ;; This file is part of GNU Emacs.
 
@@ -2995,7 +2995,7 @@
              (vc-file-setprop file 'vc-workfile-version (match-string 1)))
          ;; get file status
 	 (if (re-search-forward 
-              (concat "^\\(\\([CMU]\\) \\)?" 
+              (concat "^\\(\\([CMUP]\\) \\)?" 
                       (regexp-quote (file-name-nondirectory file))
 		      "\\( already contains the differences between \\)?")
               nil t)