Fix bug: C-x v v discarded existing log message.

* lisp/vc/vc-dispatcher.el (vc-log-edit):
Don't clobber an already-existing log message.

Fixes: debbugs:17884

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ba53fec8e4f670504a9c39d5e833a37061904b27..e77058569d2b4e3331f3eca9bea56de2261db222 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-07-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Fix bug: C-x v v discarded existing log message (Bug#17884).
+       * vc/vc-dispatcher.el (vc-log-edit):
+       Don't clobber an already-existing log message.
+
 2014-07-10  Glenn Morris  <rgm@gnu.org>
 
        * vc/log-edit.el (log-edit-changelog-entries):

diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index a0efe023a1d61f2d82ad510361f6c0dca2718b36..0445891ed5523d1f04d37ec65a14cd3e3b1ff0fb 100644 (file)
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -596,7 +596,7 @@ NOT-URGENT means it is ok to continue if the user says not to save."
   (setq default-directory
        (buffer-local-value 'default-directory vc-parent-buffer))
   (log-edit 'vc-finish-logentry
-           t
+           (= (point-min) (point-max))
            `((log-edit-listfun . (lambda ()
                                     ;; FIXME: Should expand the list
                                     ;; for directories.