aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorGlenn Morris2012-06-05 21:06:54 -0400
committerGlenn Morris2012-06-05 21:06:54 -0400
commit276d5f5de52a2226e818e3b2361e0858bda9cec6 (patch)
treeb2d3fb3d5ed61fe6f74d35cfeff2df07c9a69072 /lib-src
parent7a58f64d95ae1bc62c36c379f3ff22a3a6594c31 (diff)
downloademacs-276d5f5de52a2226e818e3b2361e0858bda9cec6.tar.gz
emacs-276d5f5de52a2226e818e3b2361e0858bda9cec6.zip
Remove lib-src/vcdiff
* lib-src/vcdiff: Remove file. * lib-src/Makefile.in (SCRIPTS, STAMP_SCRIPTS): Remove vcdiff. (stamp-vcdiff): Remove. * INSTALL, make-dist: Remove vcdiff. * lisp/emacs-lisp/authors.el (authors-fixed-entries): Remove vcdiff
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog6
-rw-r--r--lib-src/Makefile.in8
-rwxr-xr-xlib-src/vcdiff114
3 files changed, 8 insertions, 120 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 9565be361d7..a1cdb53649d 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
12012-06-06 Glenn Morris <rgm@gnu.org>
2
3 * vcdiff: Remove file.
4 * Makefile.in (SCRIPTS, STAMP_SCRIPTS): Remove vcdiff.
5 (stamp-vcdiff): Remove.
6
12012-06-05 Glenn Morris <rgm@gnu.org> 72012-06-05 Glenn Morris <rgm@gnu.org>
2 8
3 * makefile.w32-in ($(BLD)/getdate.$(O), $(BLD)/leditcfns.$(O)): 9 * makefile.w32-in ($(BLD)/getdate.$(O), $(BLD)/leditcfns.$(O)):
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index f3fd640576b..136045a9cd5 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -129,8 +129,8 @@ DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT}
129 129
130# Like UTILITIES, but they're not system-dependent, and should not be 130# Like UTILITIES, but they're not system-dependent, and should not be
131# deleted by the distclean target. 131# deleted by the distclean target.
132SCRIPTS= rcs2log vcdiff 132SCRIPTS= rcs2log
133STAMP_SCRIPTS= stamp-rcs2log stamp-vcdiff 133STAMP_SCRIPTS= stamp-rcs2log
134 134
135# All files that are created by the linker, i.e., whose names end in ${EXEEXT}. 135# All files that are created by the linker, i.e., whose names end in ${EXEEXT}.
136EXE_FILES = ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL} 136EXE_FILES = ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL}
@@ -199,10 +199,6 @@ stamp-grep-changelog: $(srcdir)/grep-changelog
199 $(insrcdir) || cp -p $(srcdir)/grep-changelog grep-changelog 199 $(insrcdir) || cp -p $(srcdir)/grep-changelog grep-changelog
200 touch $@ 200 touch $@
201 201
202stamp-vcdiff: $(srcdir)/vcdiff
203 $(insrcdir) || cp -p $(srcdir)/vcdiff vcdiff
204 touch $@
205
206## Only used if we need blessmail, but no harm in always defining. 202## Only used if we need blessmail, but no harm in always defining.
207## This makes the actual blessmail executable. 203## This makes the actual blessmail executable.
208blessmail: 204blessmail:
diff --git a/lib-src/vcdiff b/lib-src/vcdiff
deleted file mode 100755
index dd7ca446d7c..00000000000
--- a/lib-src/vcdiff
+++ /dev/null
@@ -1,114 +0,0 @@
1#! /bin/sh
2
3# Enhanced sccs diff utility for use with vc mode.
4# This version is more compatible with rcsdiff(1).
5
6# Copyright (C) 1992-1993, 1995, 1997, 2001-2012
7# Free Software Foundation, Inc.
8
9# Author: Paul Eggert
10# (according to authors.el)
11
12# This file is part of GNU Emacs.
13
14# GNU Emacs is free software: you can redistribute it and/or modify
15# it under the terms of the GNU General Public License as published by
16# the Free Software Foundation, either version 3 of the License, or
17# (at your option) any later version.
18
19# GNU Emacs is distributed in the hope that it will be useful,
20# but WITHOUT ANY WARRANTY; without even the implied warranty of
21# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22# GNU General Public License for more details.
23
24# You should have received a copy of the GNU General Public License
25# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
26
27
28DIFF="diff"
29usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
30
31# Now that we use `sccs get' rather than just `get', we don't need this.
32# PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts
33
34echo="echo"
35sid1= sid2=
36
37for f
38do
39 case $f in
40 -*)
41 case $f in
42 --brief)
43 DIFF=cmp;;
44 -q)
45 echo=:;;
46 -r?*)
47 case $sid1 in
48 '')
49 sid1=$f
50 ;;
51 *)
52 case $sid2 in
53 ?*) echo "$usage" >&2; exit 2 ;;
54 esac
55 sid2=$f
56 ;;
57 esac
58 ;;
59 *)
60 options="$options $f"
61 ;;
62 esac
63 shift
64 ;;
65 *)
66 break
67 ;;
68 esac
69done
70
71case $# in
720)
73 echo "$usage" >&2
74 exit 2
75esac
76
77
78rev1= rev2= status=0
79trap 'status=2; exit' 1 2 13 15
80trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0
81
82for f
83do
84 s=2
85
86 case $f in
87 s.* | */s.*)
88 if
89 rev1=`mktemp /tmp/geta.XXXXXXXX`
90 sccs get -s -p -k $sid1 "$f" > $rev1 &&
91 case $sid2 in
92 '')
93 workfile=`expr " /$f" : '.*/s.\(.*\)'`
94 ;;
95 *)
96 rev2=`mktemp /tmp/getb.XXXXXXXX`
97 sccs get -s -p -k $sid2 "$f" > $rev2
98 workfile=$rev2
99 esac
100 then
101 $echo $DIFF $options $rev1 $workfile >&2
102 $DIFF $options $rev1 $workfile
103 s=$?
104 fi
105 ;;
106 *)
107 echo "$0: $f is not an SCCS file" >&2
108 esac
109
110 if test $status -lt $s
111 then status=$s
112 fi
113done
114