From a2272f321b312b3f5652462518d87ff74b39f73c Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Sat, 1 Apr 2000 12:19:35 +0000 Subject: [PATCH] (vc-backend-diff): Return the correct status if we had to retry the rcsdiff command without the --brief option. --- lisp/vc.el | 11 ++++++----- 1 file 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 @@ ;; Author: Eric S. Raymond ;; Maintainer: Andre Spiegel -;; $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)) -- 2.39.5