Commit 276d5f5d authored by Glenn Morris's avatar Glenn Morris

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
parent 7a58f64d
2012-06-06 Glenn Morris <rgm@gnu.org>
* INSTALL, make-dist: Remove vcdiff.
2012-06-03 Glenn Morris <rgm@gnu.org>
* INSTALL, make-dist: Remove rcs-checkin.
......
......@@ -719,7 +719,7 @@ directory of the Emacs distribution.
in `./lib-src' to their final destinations, as selected in `./src/epaths.h'.
Strictly speaking, not all of the executables in `./lib-src' need be copied.
- The programs `hexl', `movemail', `profile', `rcs2log', and `vcdiff'
- The programs `hexl', `movemail', `profile', and `rcs2log'
are used by Emacs; they do need to be copied.
- The programs `etags', `ctags', and `emacsclient' are intended to be
run by users; they are handled below.
......
......@@ -44,6 +44,11 @@ you want them.
** On Mac OS X, configure no longer automatically adds the Fink /sw
directories to the search path. You must add them yourself if you want them.
---
** The standalone scripts rcs-checkin and vcdiff have been removed
(from the bin and libexec directories, respectively). The former is
no longer relevant, the latter is replaced by lisp (in vc-sccs.el).
* Startup Changes in Emacs 24.2
......
2012-06-06 Glenn Morris <rgm@gnu.org>
* vcdiff: Remove file.
* Makefile.in (SCRIPTS, STAMP_SCRIPTS): Remove vcdiff.
(stamp-vcdiff): Remove.
2012-06-05 Glenn Morris <rgm@gnu.org>
* makefile.w32-in ($(BLD)/getdate.$(O), $(BLD)/leditcfns.$(O)):
......
......@@ -129,8 +129,8 @@ DONT_INSTALL= test-distrib${EXEEXT} make-docfile${EXEEXT}
# Like UTILITIES, but they're not system-dependent, and should not be
# deleted by the distclean target.
SCRIPTS= rcs2log vcdiff
STAMP_SCRIPTS= stamp-rcs2log stamp-vcdiff
SCRIPTS= rcs2log
STAMP_SCRIPTS= stamp-rcs2log
# All files that are created by the linker, i.e., whose names end in ${EXEEXT}.
EXE_FILES = ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL}
......@@ -199,10 +199,6 @@ stamp-grep-changelog: $(srcdir)/grep-changelog
$(insrcdir) || cp -p $(srcdir)/grep-changelog grep-changelog
touch $@
stamp-vcdiff: $(srcdir)/vcdiff
$(insrcdir) || cp -p $(srcdir)/vcdiff vcdiff
touch $@
## Only used if we need blessmail, but no harm in always defining.
## This makes the actual blessmail executable.
blessmail:
......
#! /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-2012
# Free Software Foundation, Inc.
# Author: Paul Eggert
# (according to authors.el)
# 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 3 of the License, 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. If not, see <http://www.gnu.org/licenses/>.
DIFF="diff"
usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
# Now that we use `sccs get' rather than just `get', we don't need this.
# PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts
echo="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=`mktemp /tmp/geta.XXXXXXXX`
sccs get -s -p -k $sid1 "$f" > $rev1 &&
case $sid2 in
'')
workfile=`expr " /$f" : '.*/s.\(.*\)'`
;;
*)
rev2=`mktemp /tmp/getb.XXXXXXXX`
sccs get -s -p -k $sid2 "$f" > $rev2
workfile=$rev2
esac
then
$echo $DIFF $options $rev1 $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
2012-06-06 Glenn Morris <rgm@gnu.org>
* emacs-lisp/authors.el (authors-fixed-entries): Remove vcdiff
* vc/vc-sccs.el (vc-sccs-write-revision): New function.
(vc-sccs-workfile-unchanged-p): Use vc-sccs-write-revision.
(vc-sccs-diff): Replace use of the external vcdiff script.
......
......@@ -399,7 +399,7 @@ Changes to files in this list are not listed.")
("Lawrence R. Dodd" :cowrote "dired-x.el")
;; No longer distributed.
;;; ("Viktor Dukhovni" :wrote "unexsunos4.c")
("Paul Eggert" :wrote "rcs2log" "vcdiff")
("Paul Eggert" :wrote "rcs2log") ; "vcdiff"
("Fred Fish" :changed "unexcoff.c")
;; No longer distributed.
;;; ("Tim Fleehart" :wrote "makefile.nt")
......
......@@ -386,7 +386,7 @@ echo "Making links to \`lib'"
echo "Making links to \`lib-src'"
(cd lib-src
ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src
ln ChangeLog Makefile.in README testfile vcdiff ../${tempdir}/lib-src
ln ChangeLog Makefile.in README testfile ../${tempdir}/lib-src
ln grep-changelog rcs2log ../${tempdir}/lib-src
ln makefile.w32-in ../${tempdir}/lib-src)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment