From: Eric S. Raymond <esr@snark.thyrsus.com>
Date: Wed, 2 Feb 1994 03:27:26 +0000 (+0000)
Subject: vc-parse-buffer: arrange for old properties to get cleared when their
X-Git-Tag: emacs-19.34~10119
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1892807a4da003baad3b890cc25c458502f74e36;p=emacs.git

vc-parse-buffer: arrange for old properties to get cleared when their
match string is not found in the master file.
---

diff --git a/lisp/vc.el b/lisp/vc.el
index 0eac75a2c4b..59054fa1826 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1992, 1993 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
-;; Version: 5.4
+;; Version: 5.5
 
 ;; This file is part of GNU Emacs.
 
@@ -1292,11 +1292,12 @@ From a program, any arguments are passed to the `rcs2log' script."
 				   (vc-match-substring 1))))))
 		   latest-val))
 	     (prog1
-		 (and (re-search-forward p nil t)
-		      (let ((value (vc-match-substring 1)))
-			(if file
-			    (vc-file-setprop file (car properties) value))
-			value))
+		 (let ((value nil))
+		   (if (re-search-forward p nil t)
+		       (setq value (vc-match-substring 1)))
+		   (if file
+		       (vc-file-setprop file (car properties) value))
+		   value)
 	       (setq properties (cdr properties)))))
 	  patterns)
   )