changeset 12367:f268f652055e

(vc-insert-file): Erase the current buffer before inserting the file. (vc-fetch-master-properties, vc-fetch-properties): Don't erase the buffer because that is now done in vc-insert-file. (vc-fetch-properties): Kill the *vc-info* buffer when done.
author Richard M. Stallman <rms@gnu.org>
date Fri, 23 Jun 1995 22:46:56 +0000
parents 8415d665d19f
children dc2ce070185e
files lisp/vc-hooks.el
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/vc-hooks.el	Fri Jun 23 22:15:43 1995 +0000
+++ b/lisp/vc-hooks.el	Fri Jun 23 22:46:56 1995 +0000
@@ -172,6 +172,7 @@
   ;; (default 8 kByte), until the first occurence of
   ;; LIMIT is found. The function returns nil if FILE 
   ;; doesn't exist.
+  (erase-buffer)
   (cond ((file-exists-p file)
 	 (cond (limit
 		(if (not blocksize) (setq blocksize 8192))
@@ -231,8 +232,7 @@
      ((eq (vc-backend file) 'SCCS)
       (set-buffer (get-buffer-create "*vc-info*"))
       (if (vc-insert-file (vc-lock-file file))
-	  (progn (vc-parse-locks file (buffer-string))
-		 (erase-buffer))
+	  (vc-parse-locks file (buffer-string))
 	(vc-file-setprop file 'vc-master-locks 'none))
       (vc-insert-file (vc-name file) "^\001e")
       (vc-parse-buffer 
@@ -266,8 +266,7 @@
 			default-branch)
 	  (vc-file-setprop file 'vc-top-version default-branch))
 	 ;; else, search for the tip of the default branch
-	 (t (erase-buffer)
-	    (vc-insert-file (vc-name file) "^desc")
+	 (t (vc-insert-file (vc-name file) "^desc")
 	    (vc-parse-buffer (list (list 
 	       (concat "^\\(" 
 		       (regexp-quote default-branch)
@@ -586,7 +585,9 @@
 			   "author[ \t]+"
 			   (regexp-quote (user-login-name)) ";") 1 2))
        file
-       '(vc-latest-version vc-your-latest-version))))
+       '(vc-latest-version vc-your-latest-version))
+      (if (get-buffer "*vc-info*")
+	  (kill-buffer (get-buffer "*vc-info*")))))
    (t (vc-fetch-master-properties file))
    ))