Commit a2272f32 authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

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

retry the rcsdiff command without the --brief option.
parent 46a610ab
......@@ -5,7 +5,7 @@
;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; 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.
......@@ -2951,10 +2951,11 @@ THRESHOLD, nil otherwise"
;; If --brief didn't work, do a double-take and remember it
;; for the future.
(if (eq status 2)
(prog1
(apply 'vc-do-command "*vc-diff*" 1 "rcsdiff" file 'WORKFILE
(if cmp (cdr options) options))
(if cmp (setq vc-rcsdiff-knows-brief 'no)))
(setq status
(prog1
(apply 'vc-do-command "*vc-diff*" 1 "rcsdiff" file 'WORKFILE
(if cmp (cdr options) options))
(if cmp (setq vc-rcsdiff-knows-brief 'no))))
;; If --brief DID work, remember that, too.
(and cmp (not vc-rcsdiff-knows-brief)
(setq vc-rcsdiff-knows-brief 'yes))
......
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