summaryrefslogtreecommitdiff
path: root/lisp/vc.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1997-02-10 20:43:37 +0000
committerRichard M. Stallman <rms@gnu.org>1997-02-10 20:43:37 +0000
commit2bb00bdd36e352a189cd421afe8e7c351b3e9aab (patch)
treed59493e52f8f1214199c12c5e71fa768c73ca885 /lisp/vc.el
parent7bf5e9e404469594957082b47edbdcb696cead3a (diff)
downloademacs-2bb00bdd36e352a189cd421afe8e7c351b3e9aab.tar.gz
(vc-do-command): If OKSTATUS is nil, ignore errors.
(vc-backend-release): For RCS, pass nil for OKSTATUS.
Diffstat (limited to 'lisp/vc.el')
-rw-r--r--lisp/vc.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/vc.el b/lisp/vc.el
index 9e1e4d5fabb..8f85f887538 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -217,7 +217,7 @@ If nil, VC itself computes this value when it is first needed.")
(cond
((eq backend 'RCS)
(or vc-rcs-release
- (and (zerop (vc-do-command nil 2 "rcs" nil nil "-V"))
+ (and (zerop (vc-do-command nil nil "rcs" nil nil "-V"))
(save-excursion
(set-buffer (get-buffer "*vc*"))
(setq vc-rcs-release
@@ -377,6 +377,7 @@ If nil, VC itself computes this value when it is first needed.")
"Execute a version-control command, notifying user and checking for errors.
Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil.
The command is successful if its exit status does not exceed OKSTATUS.
+ (If OKSTATUS is nil, that means to ignore errors.)
The last argument of the command is the master name of FILE if LAST is
`MASTER', or the workfile of FILE if LAST is `WORKFILE'; this is appended
to an optional list of FLAGS."
@@ -421,7 +422,7 @@ to an optional list of FLAGS."
(goto-char (point-max))
(set-buffer-modified-p nil)
(forward-line -1)
- (if (or (not (integerp status)) (< okstatus status))
+ (if (or (not (integerp status)) (and okstatus (< okstatus status)))
(progn
(pop-to-buffer buffer)
(goto-char (point-min))