Commit 2bb00bdd authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(vc-do-command): If OKSTATUS is nil, ignore errors.

(vc-backend-release): For RCS, pass nil for OKSTATUS.
parent 7bf5e9e4
...@@ -217,7 +217,7 @@ If nil, VC itself computes this value when it is first needed.") ...@@ -217,7 +217,7 @@ If nil, VC itself computes this value when it is first needed.")
(cond (cond
((eq backend 'RCS) ((eq backend 'RCS)
(or vc-rcs-release (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 (save-excursion
(set-buffer (get-buffer "*vc*")) (set-buffer (get-buffer "*vc*"))
(setq vc-rcs-release (setq vc-rcs-release
...@@ -377,6 +377,7 @@ If nil, VC itself computes this value when it is first needed.") ...@@ -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. "Execute a version-control command, notifying user and checking for errors.
Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil. Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil.
The command is successful if its exit status does not exceed OKSTATUS. 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 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 `MASTER', or the workfile of FILE if LAST is `WORKFILE'; this is appended
to an optional list of FLAGS." to an optional list of FLAGS."
...@@ -421,7 +422,7 @@ to an optional list of FLAGS." ...@@ -421,7 +422,7 @@ to an optional list of FLAGS."
(goto-char (point-max)) (goto-char (point-max))
(set-buffer-modified-p nil) (set-buffer-modified-p nil)
(forward-line -1) (forward-line -1)
(if (or (not (integerp status)) (< okstatus status)) (if (or (not (integerp status)) (and okstatus (< okstatus status)))
(progn (progn
(pop-to-buffer buffer) (pop-to-buffer buffer)
(goto-char (point-min)) (goto-char (point-min))
......
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