aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2015-06-22 19:06:23 +0300
committerEli Zaretskii2015-06-22 19:06:23 +0300
commitfff0184e38342deedafd2ab0db7b51c692f461c7 (patch)
tree9ca74c2d079c3a81c13ad4bb6613365a522dbb0d
parent14eba4941892cb765808432d6d870fc41762bec4 (diff)
downloademacs-fff0184e38342deedafd2ab0db7b51c692f461c7.tar.gz
emacs-fff0184e38342deedafd2ab0db7b51c692f461c7.zip
Fix RCS crashes in vc-test
* lisp/vc/vc-rcs.el (vc-rcs-register): Avoid crashes with some old ports of 'ci' on MS-Windows by always passing the -t- switch.
-rw-r--r--lisp/vc/vc-rcs.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index 1e1990890a2..71ffa55a6e9 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -243,7 +243,9 @@ to the RCS command."
243 ;; if available, use the secure registering option 243 ;; if available, use the secure registering option
244 (and (vc-rcs-release-p "5.6.4") "-i") 244 (and (vc-rcs-release-p "5.6.4") "-i")
245 "-u" 245 "-u"
246 (and comment (concat "-t-" comment)) 246 ;; Some old MS-Windows ports of RCS crash when "ci -i" is
247 ;; invoked without -t; indulge them.
248 (concat "-t-" (or comment ""))
247 (vc-switches 'RCS 'register)) 249 (vc-switches 'RCS 'register))
248 ;; parse output to find master file name and workfile version 250 ;; parse output to find master file name and workfile version
249 (with-current-buffer "*vc*" 251 (with-current-buffer "*vc*"