Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-46

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 157-163)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 58-61)

   - Update from CVS

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