aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2000-04-01 12:19:35 +0000
committerGerd Moellmann2000-04-01 12:19:35 +0000
commita2272f321b312b3f5652462518d87ff74b39f73c (patch)
tree7c7473ed72c859a33b1838579a66534318c0841b
parent46a610ab78b8e027887bbf70dbbd90eae265a8a1 (diff)
downloademacs-a2272f321b312b3f5652462518d87ff74b39f73c.tar.gz
emacs-a2272f321b312b3f5652462518d87ff74b39f73c.zip
(vc-backend-diff): Return the correct status if we had to
retry the rcsdiff command without the --brief option.
-rw-r--r--lisp/vc.el11
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/vc.el b/lisp/vc.el
index e6766996e91..250084402e6 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -5,7 +5,7 @@
5;; Author: Eric S. Raymond <esr@snark.thyrsus.com> 5;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
6;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> 6;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
7 7
8;; $Id: vc.el,v 1.258 1999/12/02 14:21:08 gerd Exp $ 8;; $Id: vc.el,v 1.259 2000/01/26 10:31:13 gerd Exp $
9 9
10;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
11 11
@@ -2951,10 +2951,11 @@ THRESHOLD, nil otherwise"
2951 ;; If --brief didn't work, do a double-take and remember it 2951 ;; If --brief didn't work, do a double-take and remember it
2952 ;; for the future. 2952 ;; for the future.
2953 (if (eq status 2) 2953 (if (eq status 2)
2954 (prog1 2954 (setq status
2955 (apply 'vc-do-command "*vc-diff*" 1 "rcsdiff" file 'WORKFILE 2955 (prog1
2956 (if cmp (cdr options) options)) 2956 (apply 'vc-do-command "*vc-diff*" 1 "rcsdiff" file 'WORKFILE
2957 (if cmp (setq vc-rcsdiff-knows-brief 'no))) 2957 (if cmp (cdr options) options))
2958 (if cmp (setq vc-rcsdiff-knows-brief 'no))))
2958 ;; If --brief DID work, remember that, too. 2959 ;; If --brief DID work, remember that, too.
2959 (and cmp (not vc-rcsdiff-knows-brief) 2960 (and cmp (not vc-rcsdiff-knows-brief)
2960 (setq vc-rcsdiff-knows-brief 'yes)) 2961 (setq vc-rcsdiff-knows-brief 'yes))