annotate lib-src/vcdiff @ 613:023b83f4e54b
[xemacs-hg @ 2001-06-10 10:42:16 by ben]
------ signal-code changes ------
data.c, device-tty.c, emacs.c, floatfns.c, linuxplay.c, nas.c,
process-unix.c, signal.c, sunplay.c, sysdep.c, syssignal.h:
use EMACS_SIGNAL everywhere instead of playing preprocessing
games with signal().
s\windowsnt.h, s\mingw32.h, syssignal.h:
Remove mswindows signal code from s+m headers and move to
syssignal.h as one of the five ways of signal handling,
instead of playing preprocessing games.
fileio.c, sysdep.c:
Rename sys_do_signal to qxe_reliable_signal.
signal.c, process-unix.c, profile.c:
Create set_timeout_signal(); use instead of just EMACS_SIGNAL
to establish a signal handler on a timeout signal; this does
special things under Cygwin.
nt.c:
Eliminate term_ntproc(), which is blank; used as a SIGABRT
handler, which was wrong anyway.
nt.c, win32.c:
Move signal code from nt.c to win32.c, since Cygwin needs it
too when dealing with timeout signals.
s\cygwin32.h:
Define CYGWIN_BROKEN_SIGNALS.
------ other changes ------
s\mingw32.h:
Fix problems with NOT_C_CODE being in the wrong place and
excluding defines needed when building Makefile.in.in.
filelock.c, mule-canna.c, mule-ccl.c, mule-ccl.h, ralloc.c,
unexalpha.c, unexapollo.c, unexcw.c, unexelfsgi.c, unexnt.c,
unexsni.c, s\aix3-1.h, s\bsd4-1.h, s\bsd4-2.h, s\bsd4-3.h, s\cxux.h,
s\cygwin32.h, s\dgux.h, s\dgux5-4r2.h, s\dgux5-4r3.h, s\dgux5-4r4.h,
s\ewsux5r4.h, s\gnu.h, s\hpux.h, s\iris3-5.h, s\iris3-6.h,
s\irix3-3.h, s\linux.h, s\mingw32.h, s\newsos5.h, s\nextstep.h,
s\ptx.h, s\riscix1-1.h, s\riscix1-2.h, s\rtu.h, s\sco4.h, s\sco5.h,
s\template.h, s\ultrix.h, s\umax.h, s\umips.h, s\unipl5-0.h,
s\unipl5-2.h, s\usg5-0.h, s\usg5-2-2.h, s\usg5-2.h, s\usg5-3.h,
s\usg5-4.h, s\windowsnt.h, s\xenix.h:
Rename 'GNU Emacs' to XEmacs in the copyright and comments.
nas.c:
Stylistic cleanup. Avoid preprocessing games with names such
as play_sound_file.
------ signal-code changes ------
data.c, device-tty.c, emacs.c, floatfns.c, linuxplay.c, nas.c,
process-unix.c, signal.c, sunplay.c, sysdep.c, syssignal.h:
use EMACS_SIGNAL everywhere instead of playing preprocessing
games with signal().
s\windowsnt.h, s\mingw32.h, syssignal.h:
Remove mswindows signal code from s+m headers and move to
syssignal.h as one of the five ways of signal handling,
instead of playing preprocessing games.
fileio.c, sysdep.c:
Rename sys_do_signal to qxe_reliable_signal.
signal.c, process-unix.c, profile.c:
Create set_timeout_signal(); use instead of just EMACS_SIGNAL
to establish a signal handler on a timeout signal; this does
special things under Cygwin.
nt.c:
Eliminate term_ntproc(), which is blank; used as a SIGABRT
handler, which was wrong anyway.
nt.c, win32.c:
Move signal code from nt.c to win32.c, since Cygwin needs it
too when dealing with timeout signals.
s\cygwin32.h:
Define CYGWIN_BROKEN_SIGNALS.
------ other changes ------
s\mingw32.h:
Fix problems with NOT_C_CODE being in the wrong place and
excluding defines needed when building Makefile.in.in.
filelock.c, mule-canna.c, mule-ccl.c, mule-ccl.h, ralloc.c,
unexalpha.c, unexapollo.c, unexcw.c, unexelfsgi.c, unexnt.c,
unexsni.c, s\aix3-1.h, s\bsd4-1.h, s\bsd4-2.h, s\bsd4-3.h, s\cxux.h,
s\cygwin32.h, s\dgux.h, s\dgux5-4r2.h, s\dgux5-4r3.h, s\dgux5-4r4.h,
s\ewsux5r4.h, s\gnu.h, s\hpux.h, s\iris3-5.h, s\iris3-6.h,
s\irix3-3.h, s\linux.h, s\mingw32.h, s\newsos5.h, s\nextstep.h,
s\ptx.h, s\riscix1-1.h, s\riscix1-2.h, s\rtu.h, s\sco4.h, s\sco5.h,
s\template.h, s\ultrix.h, s\umax.h, s\umips.h, s\unipl5-0.h,
s\unipl5-2.h, s\usg5-0.h, s\usg5-2-2.h, s\usg5-2.h, s\usg5-3.h,
s\usg5-4.h, s\windowsnt.h, s\xenix.h:
Rename 'GNU Emacs' to XEmacs in the copyright and comments.
nas.c:
Stylistic cleanup. Avoid preprocessing games with names such
as play_sound_file.
xemacs-faq.texi:
Update sections on Windows and MacOS availability.
alist.el, apropos.el, autoload.el, bytecomp.el, cl-compat.el, cl-extra.el, cl-macs.el, cl-seq.el, cl.el, cmdloop.el, cus-edit.el, derived.el, gpm.el, itimer.el, lisp-mode.el, shadow.el, version.el, wid-browse.el:
Rename 'GNU Emacs' to XEmacs in the copyright. Fix other
references to GNU Emacs that should be XEmacs or just Emacs.
files.el:
Fix warning.
simple.el:
transpose-line-up/down will now move the region up or down by
a line if active.
cvtmail.c, fakemail.c, gnuserv.c, gnuserv.h, gnuslib.c, make-msgfile.c, make-path.c, pop.c, pop.h, profile.c, tcp.c:
Rename 'GNU Emacs' to XEmacs in the copyright.
Fix comments in similar ways.
digest-doc.c, sorted-doc.c:
Fix program and author name to reflect XEmacs.
| author |
ben |
| date |
Sun, 10 Jun 2001 10:42:39 +0000 |
| parents |
376386a54a3c |
| children |
061f4f90f874 06dd936cde16 |
| rev |
line source |
|
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 # !Id: vcdiff,v 1.4 1993/12/03 09:29:18 eggert Exp !
|
|
|
7 #
|
|
|
8 # Modified by: vladimir@Eng.Sun.COM on 95-06-07
|
|
|
9 # * Made sure that file arguments are specifed as s.<filename>.
|
|
|
10 # * Switched the assignments to $f inside the 3rd and 4th case statements of
|
|
|
11 # the first for-loop
|
|
|
12 # * Removed the incorrect initialization of sid1 before the first for-loop.
|
|
|
13 #
|
|
|
14
|
|
|
15 DIFF="diff"
|
|
|
16 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
|
|
|
17
|
|
|
18 PATH=$PATH:/usr/ccs/bin:/usr/sccs # common SCCS hangouts
|
|
|
19
|
|
|
20 echo=
|
|
|
21 sid1= sid2=
|
|
|
22
|
|
|
23 for f
|
|
|
24 do
|
|
|
25 case $f in
|
|
|
26 -*)
|
|
|
27 case $f in
|
|
|
28 --brief)
|
|
|
29 DIFF=cmp;;
|
|
|
30 -q)
|
|
|
31 echo=:;;
|
|
|
32 -r?*)
|
|
|
33 case $sid1 in
|
|
|
34 -r*)
|
|
|
35 sid2=$f
|
|
|
36 ;;
|
|
|
37 *)
|
|
|
38 case $sid2 in
|
|
|
39 ?*) echo "$usage" >&2; exit 2 ;;
|
|
|
40 esac
|
|
|
41 sid1=$f
|
|
|
42 ;;
|
|
|
43 esac
|
|
|
44 ;;
|
|
|
45 *)
|
|
|
46 options="$options $f"
|
|
|
47 ;;
|
|
|
48 esac
|
|
|
49 shift
|
|
|
50 ;;
|
|
|
51 *)
|
|
|
52 break
|
|
|
53 ;;
|
|
|
54 esac
|
|
|
55 done
|
|
|
56
|
|
|
57 case $# in
|
|
|
58 0)
|
|
|
59 echo "$usage" >&2
|
|
|
60 exit 2
|
|
|
61 esac
|
|
|
62
|
|
|
63
|
|
|
64 rev1= rev2= status=0
|
|
|
65 trap 'status=2; exit' 1 2 13 15
|
|
|
66 trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0
|
|
|
67
|
|
|
68 for f
|
|
|
69 do
|
|
|
70 s=2
|
|
|
71
|
|
|
72 # For files under SCCS control, fixup the file name to be the s. filename
|
|
|
73 if [ -d SCCS ]; then
|
|
|
74 if [ $f = `echo $f | sed -e 's|SCCS/s.||'` ]; then
|
|
|
75 f="SCCS/s.$f"
|
|
|
76 fi
|
|
|
77 fi
|
|
|
78
|
|
|
79 case $f in
|
|
|
80 s.* | */s.*)
|
|
|
81 if
|
|
|
82 rev1=/tmp/geta$$
|
|
|
83 get -s -p -k $sid1 "$f" > $rev1 &&
|
|
|
84 case $sid2 in
|
|
|
85 '')
|
|
|
86 workfile=`expr " /$f" : '.*/s.\(.*\)'`
|
|
|
87 ;;
|
|
|
88 *)
|
|
|
89 rev2=/tmp/getb$$
|
|
|
90 get -s -p -k $sid2 "$f" > $rev2
|
|
|
91 workfile=$rev2
|
|
|
92 esac
|
|
|
93 then
|
|
|
94 $echo $DIFF $options $sid1 $sid2 $workfile >&2
|
|
|
95 $DIFF $options $rev1 $workfile
|
|
|
96 s=$?
|
|
|
97 fi
|
|
|
98 ;;
|
|
|
99 *)
|
|
|
100 echo "$0: $f is not an SCCS file" >&2
|
|
|
101 esac
|
|
|
102
|
|
|
103 if test $status -lt $s
|
|
|
104 then status=$s
|
|
|
105 fi
|
|
|
106 done
|
