Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-160
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-161
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-162
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-163
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-164
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-165
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-166
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-167
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-168
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-169
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-170
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-171
   Update from CVS: man/mh-e.texi (Folders): Various edits.

 * emacs@sv.gnu.org/emacs--devo--0--patch-172
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-58
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-59
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-60
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-61
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-62
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-63
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-64
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-534

2 files changed, 7 insertions, 2 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index e4e74030200..f59f7296359 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-18  Andre Spiegel  <spiegel@gnu.org>
+
+        * vcdiff: Use "echo" as a default for $echo, otherwise we'll
+        execute $DIFF twice, and once with the wrong options.
+
 2006-02-23  Claudio Fontana  <claudio@gnu.org>
 
         * Makefile.in (install, uninstall): Add DESTDIR variable to
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