From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 26 Oct 2000 20:53:11 +0000 (+0000)
Subject: (vc-start-entry): Only erase the buffer if comment is set.
X-Git-Tag: emacs-pretest-21.0.90~534
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=347bef306092311183c43c08d39c9bf544d3f812;p=emacs.git

(vc-start-entry): Only erase the buffer if comment is set.
---

diff --git a/lisp/vc.el b/lisp/vc.el
index ad14ed5f5ce..6d7d3e948ba 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -5,7 +5,7 @@
 ;; Author:     FSF (see below for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 
-;; $Id: vc.el,v 1.282 2000/10/25 21:45:09 monnier Exp $
+;; $Id: vc.el,v 1.283 2000/10/26 12:38:02 fx Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -1197,14 +1197,12 @@ for vc-log-operation-hook."
 	(setq vc-log-after-operation-hook after-hook))
     (setq vc-log-operation action)
     (setq vc-log-version rev)
-    (erase-buffer)
-    (if (eq comment t)
-	(vc-finish-logentry t)
-      (if comment
-	  (insert comment))
-      (if (and comment (not initial-contents))
-	  (vc-finish-logentry nil)
-	(message "%s  Type C-c C-c when done" msg)))))
+    (when comment
+      (erase-buffer)
+      (when (stringp comment) (insert comment)))
+    (if (or (not comment) initial-contents)
+	(message "%s  Type C-c C-c when done" msg)
+      (vc-finish-logentry (eq comment t)))))
 
 (defun vc-checkout (file &optional writable rev)
   "Retrieve a copy of the revision REV of FILE.