aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland McGrath1992-10-05 05:17:21 +0000
committerRoland McGrath1992-10-05 05:17:21 +0000
commit666a0ebb6770917c98a93b5ad8c89de4a7bdffef (patch)
tree08787eec9576533a1458fa9cb83edd1b9b01b030
parent9dce08b6085492d9622daa7f08d6b5725f021cea (diff)
downloademacs-666a0ebb6770917c98a93b5ad8c89de4a7bdffef.tar.gz
emacs-666a0ebb6770917c98a93b5ad8c89de4a7bdffef.zip
(vc-checkin-switches): New defvar.
(vc-backend-checkin): Pass vc-checkin-switches to prog.
-rw-r--r--lisp/vc.el11
1 files changed, 8 insertions, 3 deletions
diff --git a/lisp/vc.el b/lisp/vc.el
index b7f4e171b5e..2d630efabd5 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.6 1992/09/27 02:42:08 roland Exp rms $ 8;; $Id: vc.el,v 1.7 1992/09/28 13:01:53 rms Exp roland $
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11 11
@@ -73,6 +73,9 @@ The value is only computed when needed to avoid an expensive search.")
73(defvar vc-mistrust-permissions 'file-symlink-p 73(defvar vc-mistrust-permissions 'file-symlink-p
74 "*Don't assume that permissions and ownership track version-control status.") 74 "*Don't assume that permissions and ownership track version-control status.")
75 75
76(defvar vc-checkin-switches nil
77 "*Extra switches passed to the checkin program by \\[vc-checkin].")
78
76;;;###autoload 79;;;###autoload
77(defvar vc-checkin-hook nil 80(defvar vc-checkin-hook nil
78 "*List of functions called after a vc-checkin is done. See `runs-hooks'.") 81 "*List of functions called after a vc-checkin is done. See `runs-hooks'.")
@@ -1061,13 +1064,15 @@ Return nil if there is no such person."
1061 (progn 1064 (progn
1062 (vc-do-command 0 "delta" file 1065 (vc-do-command 0 "delta" file
1063 (if rev (concat "-r" rev)) 1066 (if rev (concat "-r" rev))
1064 (concat "-y" comment)) 1067 (concat "-y" comment)
1068 vc-checkin-switches)
1065 (if vc-keep-workfiles 1069 (if vc-keep-workfiles
1066 (vc-do-command 0 "get" file)) 1070 (vc-do-command 0 "get" file))
1067 ) 1071 )
1068 (vc-do-command 0 "ci" file 1072 (vc-do-command 0 "ci" file
1069 (concat (if vc-keep-workfiles "-u" "-r") rev) 1073 (concat (if vc-keep-workfiles "-u" "-r") rev)
1070 (concat "-m" comment)) 1074 (concat "-m" comment)
1075 vc-checkin-switches)
1071 ) 1076 )
1072 (vc-file-setprop file 'vc-locking-user nil) 1077 (vc-file-setprop file 'vc-locking-user nil)
1073 (message "Checking in %s...done" file) 1078 (message "Checking in %s...done" file)