procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(vc-backend-diff): Return the correct status if we had to

Browse source 
retry the rcsdiff command without the --brief option.
This commit is contained in:
Gerd Moellmann 2000-04-01 12:19:35 +00:00
parent 46a610ab78
commit a2272f321b
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lisp/vc.el
View file

@ -5,7 +5,7 @@
;; Author: Eric S. Raymond <esr@snark.thyrsus.com> ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
;; $Id: vc.el,v 1.258 1999/12/02 14:21:08 gerd Exp $ ;; $Id: vc.el,v 1.259 2000/01/26 10:31:13 gerd Exp $
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
@ -2951,10 +2951,11 @@ THRESHOLD, nil otherwise"
;; If --brief didn't work, do a double-take and remember it ;; If --brief didn't work, do a double-take and remember it
;; for the future. ;; for the future.
(if (eq status 2) (if (eq status 2)
(prog1 (setq status
(apply 'vc-do-command "*vc-diff*" 1 "rcsdiff" file 'WORKFILE (prog1
(if cmp (cdr options) options)) (apply 'vc-do-command "*vc-diff*" 1 "rcsdiff" file 'WORKFILE
(if cmp (setq vc-rcsdiff-knows-brief 'no))) (if cmp (cdr options) options))
(if cmp (setq vc-rcsdiff-knows-brief 'no))))
;; If --brief DID work, remember that, too. ;; If --brief DID work, remember that, too.
(and cmp (not vc-rcsdiff-knows-brief) (and cmp (not vc-rcsdiff-knows-brief)
(setq vc-rcsdiff-knows-brief 'yes)) (setq vc-rcsdiff-knows-brief 'yes))