diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-07-14 15:29:29 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-07-14 15:29:29 -0400 |
| commit | be8b1ebb5c997dc37cdc789d4e9689913e2b1d12 (patch) | |
| tree | 859d511bf584414d5ceeac7dc85580bb5685d6b7 /lisp | |
| parent | b20759f920f9a64a9a03f510f1ab785426d64af3 (diff) | |
| download | emacs-be8b1ebb5c997dc37cdc789d4e9689913e2b1d12.tar.gz | |
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.
Fixes: debbugs:17884
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc/vc-dispatcher.el | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5f4c02c0670..14ed03e7570 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-07-14 Glenn Morris <rgm@gnu.org> + + * 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 <eliz@gnu.org> * bindings.el (mode-line-remote): If default-directory is not a diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el index 0445891ed55..4fd9691d2a2 100644 --- a/lisp/vc/vc-dispatcher.el +++ b/lisp/vc/vc-dispatcher.el @@ -591,12 +591,19 @@ NOT-URGENT means it is ok to continue if the user says not to save." ;; 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. |