From 051848e4984093ff3dd61d344bf65a8946d6f734 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 27 Aug 1999 07:59:22 +0000 Subject: [PATCH] (vc-backend-merge-news): Fix regexp to also match P marker from cvs update. --- lisp/vc.el | 4 ++-- 1 file 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 @@ ;; Author: Eric S. Raymond ;; Maintainer: Andre Spiegel -;; $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 @@ THRESHOLD, nil otherwise" (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) -- 2.39.5