annotate lib-src/vcdiff @ 1279:cd0abfdb9e9d

[xemacs-hg @ 2003-02-09 09:33:42 by ben] walk-windows, redisplay fixes console-stream.c: Abort when any attempts to output a stream console are made. Should be caught sooner. event-msw.c: Don't redisplay() during sizing when the frame has not yet been initialized completely. event-stream.c, menubar-msw.c, menubar-x.c, menubar.c, menubar.h: Restore in_menu_callback. Bind it in menubar-{msw,x}.c when calling filter functions and the like. Conditionalize on it, not in_modal_loop, when issuing error in `next-event', otherwise we bite the dust immediately -- event-msw.c purposely calls Fnext_event() in a modal loop, and knows what it's doing. redisplay-output.c: Formatting fixes. redisplay.c, window.c, winslots.h: Delete lots of carcasses of attempts to add redisplay support for font-lock -- `pre/post-redisplay-hook', unimplemented junk from FSF (redisplay-end-trigger, `window-scroll-functions', `window-size-change-functions'). If we want to port some redisplay support from FSF, port the `fontified' property. redisplay.c: Put in a check here (as well as redisplay_device()) for a stream frame. We can get here directly through Lisp fun `redisplay-frame'. Abort if frame not initialized. redisplay.c: Check for stream frames/devices. window.el: walk-windows was broken when a frame was given to WHICH-FRAMES. it would loop forever. The FSF version fixes this but i didn't sync to them because (a) it conses (bad for lazy-lock), (b) it calls select-window.
author ben
date Sun, 09 Feb 2003 09:33:48 +0000
parents 376386a54a3c
children 061f4f90f874 06dd936cde16
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 #!/bin/sh
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 #
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 # Enhanced sccs diff utility for use with vc mode.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
4 # This version is more compatible with rcsdiff(1).
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5 #
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 # !Id: vcdiff,v 1.4 1993/12/03 09:29:18 eggert Exp !
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7 #
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 # Modified by: vladimir@Eng.Sun.COM on 95-06-07
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 # * Made sure that file arguments are specifed as s.<filename>.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 # * Switched the assignments to $f inside the 3rd and 4th case statements of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 # the first for-loop
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12 # * Removed the incorrect initialization of sid1 before the first for-loop.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 #
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 DIFF="diff"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 PATH=$PATH:/usr/ccs/bin:/usr/sccs # common SCCS hangouts
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 echo=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 sid1= sid2=
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23 for f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24 do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25 case $f in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26 -*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 case $f in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28 --brief)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 DIFF=cmp;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30 -q)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
31 echo=:;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
32 -r?*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33 case $sid1 in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 -r*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35 sid2=$f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
36 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 case $sid2 in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 ?*) echo "$usage" >&2; exit 2 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 sid1=$f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 options="$options $f"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 shift
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 break
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
53 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
55 done
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
56
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
57 case $# in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
58 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59 echo "$usage" >&2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 exit 2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
63
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64 rev1= rev2= status=0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 trap 'status=2; exit' 1 2 13 15
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66 trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 for f
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 do
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 s=2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 # For files under SCCS control, fixup the file name to be the s. filename
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 if [ -d SCCS ]; then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 if [ $f = `echo $f | sed -e 's|SCCS/s.||'` ]; then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
75 f="SCCS/s.$f"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 fi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
77 fi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
78
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
79 case $f in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
80 s.* | */s.*)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
81 if
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
82 rev1=/tmp/geta$$
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
83 get -s -p -k $sid1 "$f" > $rev1 &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
84 case $sid2 in
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
85 '')
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
86 workfile=`expr " /$f" : '.*/s.\(.*\)'`
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
87 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
88 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
89 rev2=/tmp/getb$$
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
90 get -s -p -k $sid2 "$f" > $rev2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
91 workfile=$rev2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
92 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
93 then
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
94 $echo $DIFF $options $sid1 $sid2 $workfile >&2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
95 $DIFF $options $rev1 $workfile
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
96 s=$?
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
97 fi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
98 ;;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
99 *)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
100 echo "$0: $f is not an SCCS file" >&2
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
101 esac
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
102
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
103 if test $status -lt $s
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
104 then status=$s
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
105 fi
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
106 done