Mercurial > emacs
view lib-src/vcdiff @ 8348:bf950cbd542c
Made menu bar's autoloaded stuff conditional on
purify-flag, to avoid error message when loading ediff in a frame
that has no menu bar.
(ediff-setup): Improved mode-line-buffer-identification.
Now accommodates buffer identifications generated by
mode-line.el and uniquify.el.
(ediff-current-diff-face-A/B,
ediff-fine-diff-face-A/B,ediff-odd/even-diff-face-A/B):
Variables changed to contain face names
instead of face internal representation.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Tue, 26 Jul 1994 20:16:05 +0000 |
parents | 7124a811b67b |
children | da322c027bf0 |
line wrap: on
line source
#!/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 $ # DIFF="diff" usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..." PATH=$PATH:/usr/ccs/bin:/usr/sccs # common SCCS hangouts echo= sid1=-r sid2= for f do case $f in -*) case $f in --brief) DIFF=cmp;; -q) echo=:;; -r?*) case $sid1 in -r) 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=/tmp/geta$$ get -s -p -k $sid1 "$f" > $rev1 && case $sid2 in '') workfile=`expr " /$f" : '.*/s.\(.*\)'` ;; *) rev2=/tmp/getb$$ get -s -p -k $sid2 "$f" > $rev2 workfile=$rev2 esac then $echo $DIFF $options $sid1 $sid2 $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