view lib-src/vcdiff @ 16255:dcde843403a3

(display_mode_line): Use faces for inverse video mode line whenever possible. (echo_area_display): Shift display_string past a left-side scroll bar. (redisplay_window): Likewise. (redisplay_internal): Shift cursor past a left-side scroll bar. (redisplay_window): Likewise. (try_window_id): Likewise. (display_text_line): Likewise. (redisplay_internal): Shift charstarts past a left-side scroll bar. (display_text_line): Likewise. (redisplay_internal): Use new macro WINDOW_FULL_WIDTH_P. (redisplay_window): Likewise. (display_text_line): Likewise. (display_text_line): Shift output past left-side scroll bar. (display_text_line): Use new WINDOW_RIGHTMOST_P macro. (display_text_line): Don't pad right columns unless using a right-side scroll bar. Don't draw vertical bars unless there isn't any kind of scroll bar. (display_string): Likewise. (display_mode_line): Use new macros WINDOW_LEFT_MARGIN, WINDOW_RIGHT_MARGIN, and WINDOW_FULL_WIDTH_P. (display_string): Use new macro WINDOW_RIGHTMOST_P.
author Richard M. Stallman <rms@gnu.org>
date Sat, 21 Sep 1996 01:16:33 +0000
parents da322c027bf0
children 0ba6599135d6
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.4 1993/12/03 09:29:18 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