Commit 2ea8ce47 authored by Roland McGrath's avatar Roland McGrath
Browse files

(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.

parent d59e5e8c
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
;; Author: Eric S. Raymond <esr@snark.thyrsus.com> ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Version: 4.0 ;; Version: 4.0
;; $Id: vc.el,v 1.8 1992/10/05 05:17:21 roland Exp roland $ ;; $Id: vc.el,v 1.9 1992/10/05 05:20:52 roland Exp roland $
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
...@@ -1060,20 +1060,23 @@ Return nil if there is no such person." ...@@ -1060,20 +1060,23 @@ Return nil if there is no such person."
;; keywords expanded if vc-keep-workfiles is non-nil, otherwise ;; keywords expanded if vc-keep-workfiles is non-nil, otherwise
;; it deletes the workfile. ;; it deletes the workfile.
(message "Checking in %s..." file) (message "Checking in %s..." file)
(vc-backend-dispatch file (save-excursion
(progn ;; Change buffers to get local value of vc-checkin-switches.
(apply 'vc-do-command 0 "delta" file (set-buffer (or (get-file-buffer file) (current-buffer)))
(if rev (concat "-r" rev)) (vc-backend-dispatch file
(concat "-y" comment) (progn
vc-checkin-switches) (apply 'vc-do-command 0 "delta" file
(if vc-keep-workfiles (if rev (concat "-r" rev))
(vc-do-command 0 "get" file)) (concat "-y" comment)
) vc-checkin-switches)
(apply 'vc-do-command 0 "ci" file (if vc-keep-workfiles
(concat (if vc-keep-workfiles "-u" "-r") rev) (vc-do-command 0 "get" file))
(concat "-m" comment) )
vc-checkin-switches) (apply 'vc-do-command 0 "ci" file
) (concat (if vc-keep-workfiles "-u" "-r") rev)
(concat "-m" comment)
vc-checkin-switches)
))
(vc-file-setprop file 'vc-locking-user nil) (vc-file-setprop file 'vc-locking-user nil)
(message "Checking in %s...done" file) (message "Checking in %s...done" file)
) )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment