** offby1@blarg.net, Nov 5: calendar gets wrong end for Daylight Savings Time

[gnu-emacs] / lib-src / vcdiff

diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index e2023809e014a5ebcc6bde5319c8cdb5ea363f86..2cba89df421761668a9532a6b3837fcb4651a597 100755 (executable)
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -3,7 +3,25 @@
 # Enhanced sccs diff utility for use with vc mode.
 # This version is more compatible with rcsdiff(1).
 #
-#      $Id: vcdiff,v 1.5 1995/07/07 22:47:57 eggert Exp $
+# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004,
+#               2005, 2006 Free Software Foundation, Inc.
+#
+# This file is part of GNU Emacs.
+#
+# GNU Emacs is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs; see the file COPYING.  If not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 #
 
 DIFF="diff"
@@ -11,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
@@ -78,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
@@ -91,3 +109,5 @@ do
        then status=$s
        fi
 done
+
+# arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a