[Emacs-diffs] emacs-24 r117377: Tweak earlier vc-log-edit change

[Glenn Morris]

------------------------------------------------------------
revno: 117377
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17884
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-07-14 15:29:29 -0400
message:
  Tweak earlier vc-log-edit change
  
  * lisp/vc/vc-dispatcher.el (vc-log-edit): Do set up the log buffer
  if it was "empty", or used for a different set of files.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/vc/vc-dispatcher.el       
vcdispatcher.el-20091113204419-o5vbwnq5f7feedwu-8662

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-07-13 14:49:59 +0000
+++ b/lisp/ChangeLog    2014-07-14 19:29:29 +0000
@@ -1,3 +1,8 @@
+2014-07-14  Glenn Morris  <address@hidden>
+
+       * vc/vc-dispatcher.el (vc-log-edit): Do set up the log buffer
+       if it was "empty", or used for a different set of files.  (Bug#17884)
+
 2014-07-13  Eli Zaretskii  <address@hidden>
 
        * bindings.el (mode-line-remote): If default-directory is not a

=== modified file 'lisp/vc/vc-dispatcher.el'
--- a/lisp/vc/vc-dispatcher.el  2014-07-12 02:24:02 +0000
+++ b/lisp/vc/vc-dispatcher.el  2014-07-14 19:29:29 +0000
@@ -591,12 +591,19 @@
 
 ;; Set up key bindings for use while editing log messages
 
+(declare-function log-edit-empty-buffer-p "log-edit" ())
+
 (defun vc-log-edit (fileset mode backend)
   "Set up `log-edit' for use on FILE."
   (setq default-directory
        (buffer-local-value 'default-directory vc-parent-buffer))
+  (require 'log-edit)
   (log-edit 'vc-finish-logentry
-           (= (point-min) (point-max))
+           ;; Setup a new log message if the log buffer is "empty",
+           ;; or was previously used for a different set of files.
+           (or (log-edit-empty-buffer-p)
+               (and (local-variable-p 'vc-log-fileset)
+                    (not (equal vc-log-fileset fileset))))
            `((log-edit-listfun . (lambda ()
                                     ;; FIXME: Should expand the list
                                     ;; for directories.