(custom-theme-set-variables): Sort symbols that are

[gnu-emacs] / lib-src / vcdiff

diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 5fdc345eb988bbdc6dcf24030af85d5c53fd7056..86b80bcdacda3005c209c6ce104a5997ccec083a 100755 (executable)
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -3,14 +3,14 @@
 # Enhanced sccs diff utility for use with vc mode.
 # This version is more compatible with rcsdiff(1).
 #
-# Copyright (C) 1992, 1993, 1995, 1997, 2001
-#   Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004,
+#               2005, 2006, 2007, 2008 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)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Emacs is distributed in the hope that it will be useful,
@@ -20,10 +20,8 @@
 #
 # 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., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-#
-#      $Id: vcdiff,v 1.6 1997/01/01 05:33:42 eggert Exp $
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 #
 
 DIFF="diff"
@@ -31,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
@@ -98,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
@@ -111,3 +109,5 @@ do
        then status=$s
        fi
 done
+
+# arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a