diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-07-11 19:24:02 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-07-11 19:24:02 -0700 |
| commit | 114ce4b8797206221febb0ac0f19872855e9b151 (patch) | |
| tree | 660331a25144db86e24f72b67d571d8c6640e2e1 /lisp | |
| parent | c9a1635c3855e8a201e330b2548c2ee24159b25d (diff) | |
| download | emacs-114ce4b8797206221febb0ac0f19872855e9b151.tar.gz | |
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
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/vc/vc-dispatcher.el | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ba53fec8e4f..e77058569d2 100644 --- 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 a0efe023a1d..0445891ed55 100644 --- 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. |