aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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.")
217 (cond 217 (cond
218 ((eq backend 'RCS) 218 ((eq backend 'RCS)
219 (or vc-rcs-release 219 (or vc-rcs-release
220 (and (zerop (vc-do-command nil 2 "rcs" nil nil "-V")) 220 (and (zerop (vc-do-command nil nil "rcs" nil nil "-V"))
221 (save-excursion 221 (save-excursion
222 (set-buffer (get-buffer "*vc*")) 222 (set-buffer (get-buffer "*vc*"))
223 (setq vc-rcs-release 223 (setq vc-rcs-release
@@ -377,6 +377,7 @@ If nil, VC itself computes this value when it is first needed.")
377 "Execute a version-control command, notifying user and checking for errors. 377 "Execute a version-control command, notifying user and checking for errors.
378Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil. 378Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil.
379The command is successful if its exit status does not exceed OKSTATUS. 379The command is successful if its exit status does not exceed OKSTATUS.
380 (If OKSTATUS is nil, that means to ignore errors.)
380The last argument of the command is the master name of FILE if LAST is 381The last argument of the command is the master name of FILE if LAST is
381`MASTER', or the workfile of FILE if LAST is `WORKFILE'; this is appended 382`MASTER', or the workfile of FILE if LAST is `WORKFILE'; this is appended
382to an optional list of FLAGS." 383to an optional list of FLAGS."
@@ -421,7 +422,7 @@ to an optional list of FLAGS."
421 (goto-char (point-max)) 422 (goto-char (point-max))
422 (set-buffer-modified-p nil) 423 (set-buffer-modified-p nil)
423 (forward-line -1) 424 (forward-line -1)
424 (if (or (not (integerp status)) (< okstatus status)) 425 (if (or (not (integerp status)) (and okstatus (< okstatus status)))
425 (progn 426 (progn
426 (pop-to-buffer buffer) 427 (pop-to-buffer buffer)
427 (goto-char (point-min)) 428 (goto-char (point-min))