From: André Spiegel <spiegel@gnu.org>
Date: Sat, 18 Mar 2006 14:47:20 +0000 (+0000)
Subject: Use "echo" as a default for $echo, otherwise we'll execute $DIFF
X-Git-Tag: emacs-pretest-22.0.90~3532
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=09b7af0a1c6600f4a2412958ae66b885c79ff5f7;p=emacs.git

Use "echo" as a default for $echo, otherwise we'll execute $DIFF
twice, and once with the wrong options.
---

diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 52fdaee0f7f..2cba89df421 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -29,7 +29,7 @@ usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfil
 
 PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts
 
-echo=
+echo="echo"
 sid1= sid2=
 
 for f
@@ -96,7 +96,7 @@ do
 				workfile=$rev2
 			esac
 		then
-			$echo $DIFF $options $sid1 $sid2 $workfile >&2
+			$echo $DIFF $options $rev1 $workfile >&2
 			$DIFF $options $rev1 $workfile
 			s=$?
 		fi