aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland McGrath1992-10-05 05:20:52 +0000
committerRoland McGrath1992-10-05 05:20:52 +0000
commitd59e5e8c3c3710fcfe1e251926359de2e19c3f23 (patch)
tree53d9b43b7b9c959cf230a86f728bc8d9410b2783
parent666a0ebb6770917c98a93b5ad8c89de4a7bdffef (diff)
downloademacs-d59e5e8c3c3710fcfe1e251926359de2e19c3f23.tar.gz
emacs-d59e5e8c3c3710fcfe1e251926359de2e19c3f23.zip
(vc-backend-checkin): Use apply on vc-do-command: vc-checkin-switches is a
list.
-rw-r--r--lisp/vc.el18
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/vc.el b/lisp/vc.el
index 2d630efabd5..ff28daf64b4 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -5,7 +5,7 @@
5;; Author: Eric S. Raymond <esr@snark.thyrsus.com> 5;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
6;; Version: 4.0 6;; Version: 4.0
7 7
8;; $Id: vc.el,v 1.7 1992/09/28 13:01:53 rms Exp roland $ 8;; $Id: vc.el,v 1.8 1992/10/05 05:17:21 roland Exp roland $
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11 11
@@ -1062,17 +1062,17 @@ Return nil if there is no such person."
1062 (message "Checking in %s..." file) 1062 (message "Checking in %s..." file)
1063 (vc-backend-dispatch file 1063 (vc-backend-dispatch file
1064 (progn 1064 (progn
1065 (vc-do-command 0 "delta" file 1065 (apply 'vc-do-command 0 "delta" file
1066 (if rev (concat "-r" rev)) 1066 (if rev (concat "-r" rev))
1067 (concat "-y" comment) 1067 (concat "-y" comment)
1068 vc-checkin-switches) 1068 vc-checkin-switches)
1069 (if vc-keep-workfiles 1069 (if vc-keep-workfiles
1070 (vc-do-command 0 "get" file)) 1070 (vc-do-command 0 "get" file))
1071 ) 1071 )
1072 (vc-do-command 0 "ci" file 1072 (apply 'vc-do-command 0 "ci" file
1073 (concat (if vc-keep-workfiles "-u" "-r") rev) 1073 (concat (if vc-keep-workfiles "-u" "-r") rev)
1074 (concat "-m" comment) 1074 (concat "-m" comment)
1075 vc-checkin-switches) 1075 vc-checkin-switches)
1076 ) 1076 )
1077 (vc-file-setprop file 'vc-locking-user nil) 1077 (vc-file-setprop file 'vc-locking-user nil)
1078 (message "Checking in %s...done" file) 1078 (message "Checking in %s...done" file)