Mercurial > emacs
changeset 28460:8a724c4f9928
(vc-backend-diff): Return the correct status if we had to
retry the rcsdiff command without the --brief option.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Sat, 01 Apr 2000 12:19:35 +0000 |
| parents | d3c34ba6d095 |
| children | b6b552188c57 |
| files | lisp/vc.el |
| diffstat | 1 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc.el Sat Apr 01 12:09:42 2000 +0000 +++ b/lisp/vc.el Sat Apr 01 12:19:35 2000 +0000 @@ -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 @@ ;; 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))