Version 3.15

[gnu-emacs] / lib-src / vcdiff

diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index f5ab7645a812d29dd95a9a27b4f65ed457f43b78..a57811a7f6dff2b55bf1b17c5828ad1318c6bbed 100755 (executable)
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -1,18 +1,36 @@
-#!/bin/sh
+#! /bin/sh
 #
 # Enhanced sccs diff utility for use with vc mode.
 # This version is more compatible with rcsdiff(1).
 #
-#      $Id: vcdiff,v 1.3 1993/08/25 08:18:56 eggert Exp eggert $
+# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004,
+#               2005 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"
 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
 
-PATH=$PATH:/usr/ccs/bin:/usr/sccs # common SCCS hangouts
+PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts
 
 echo=
-sid1=-r sid2=
+sid1= sid2=
 
 for f
 do
@@ -25,7 +43,7 @@ do
                        echo=:;;
                -r?*)
                        case $sid1 in
-                       -r)
+                       '')
                                sid1=$f
                                ;;
                        *)
@@ -91,3 +109,5 @@ do
        then status=$s
        fi
 done
+
+# arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a