aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Steingold2016-03-17 15:42:15 -0400
committerSam Steingold2016-03-17 15:42:15 -0400
commit2fbdb1bb4c878f8ae17bd69d1b4ff51c47497e41 (patch)
tree5ed947f9ce017b72908567b0ff74659b8c2fbb52
parent58862751bde2611d9ea99a33ecb5b0c13a7513b9 (diff)
downloademacs-2fbdb1bb4c878f8ae17bd69d1b4ff51c47497e41.tar.gz
emacs-2fbdb1bb4c878f8ae17bd69d1b4ff51c47497e41.zip
make `vc-log-operation' buffer local to allow multiple simultaneous editing
-rw-r--r--lisp/vc/vc-dispatcher.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el
index 59f2ae329ed..a5515420a1b 100644
--- a/lisp/vc/vc-dispatcher.el
+++ b/lisp/vc/vc-dispatcher.el
@@ -669,7 +669,7 @@ BACKEND, if non-nil, specifies a VC backend for the Log Edit buffer."
669 (make-local-variable 'vc-log-after-operation-hook) 669 (make-local-variable 'vc-log-after-operation-hook)
670 (when after-hook 670 (when after-hook
671 (setq vc-log-after-operation-hook after-hook)) 671 (setq vc-log-after-operation-hook after-hook))
672 (setq vc-log-operation action) 672 (set (make-local-variable 'vc-log-operation) action)
673 (when comment 673 (when comment
674 (erase-buffer) 674 (erase-buffer)
675 (when (stringp comment) (insert comment))) 675 (when (stringp comment) (insert comment)))
@@ -711,6 +711,7 @@ the buffer contents as a comment."
711 (funcall log-operation 711 (funcall log-operation
712 log-fileset 712 log-fileset
713 log-entry)) 713 log-entry))
714 (setq vc-log-operation nil)
714 715
715 ;; Quit windows on logbuf. 716 ;; Quit windows on logbuf.
716 (cond 717 (cond