[Emacs-diffs] Changes to emacs/lib-src/vcdiff [lexbind]

[Miles Bader]

Index: emacs/lib-src/vcdiff
diff -c /dev/null emacs/lib-src/vcdiff:1.7.16.1
*** /dev/null   Tue Oct 14 19:59:26 2003
--- emacs/lib-src/vcdiff        Tue Oct 14 19:59:14 2003
***************
*** 0 ****
--- 1,115 ----
+ #! /bin/sh
+ #
+ # 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.
+ #
+ # 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., 59 Temple Place - Suite 330,
+ # Boston, MA 02111-1307, USA.
+ #
+ #     $Id: vcdiff,v 1.7.16.1 2003/10/14 23:59:14 miles Exp $
+ #
+ 
+ DIFF="diff"
+ usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] 
sccsfile..."
+ 
+ PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts
+ 
+ echo=
+ sid1= sid2=
+ 
+ for f
+ do
+       case $f in
+       -*)
+               case $f in
+               --brief)
+                       DIFF=cmp;;
+               -q)
+                       echo=:;;
+               -r?*)
+                       case $sid1 in
+                       '')
+                               sid1=$f
+                               ;;
+                       *)
+                               case $sid2 in
+                               ?*) echo "$usage" >&2; exit 2 ;;
+                               esac
+                               sid2=$f
+                               ;;
+                       esac
+                       ;;
+               *)
+                       options="$options $f"
+                       ;;
+               esac
+               shift
+               ;;
+       *)
+               break
+               ;;
+       esac
+ done
+ 
+ case $# in
+ 0)
+       echo "$usage" >&2
+       exit 2
+ esac
+ 
+ 
+ rev1= rev2= status=0
+ trap 'status=2; exit' 1 2 13 15
+ trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0
+ 
+ for f
+ do
+       s=2
+ 
+       case $f in
+       s.* | */s.*)
+               if
+                       rev1=/tmp/geta$$
+                       get -s -p -k $sid1 "$f" > $rev1 &&
+                       case $sid2 in
+                       '')
+                               workfile=`expr " /$f" : '.*/s.\(.*\)'`
+                               ;;
+                       *)
+                               rev2=/tmp/getb$$
+                               get -s -p -k $sid2 "$f" > $rev2
+                               workfile=$rev2
+                       esac
+               then
+                       $echo $DIFF $options $sid1 $sid2 $workfile >&2
+                       $DIFF $options $rev1 $workfile
+                       s=$?
+               fi
+               ;;
+       *)
+               echo "$0: $f is not an SCCS file" >&2
+       esac
+ 
+       if test $status -lt $s
+       then status=$s
+       fi
+ done
+ 
+ # arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a