view lib-src/vcdiff @ 10468:d0854b6f3216

(set-justification): New function. (set-justification-{none,left,right,full,center}): New functions. (fill-region-as-paragraph, fill-region, justify-current-line): New arg NOSQUEEZE defeats normal removal of extra whitespace. (fill-region-as-paragraph, fill-region) (fill-nonuniform-paragraphs, fill-individual-paragraphs): Arg JUSTIFY-FLAG (JUSTIFYP) renamed to JUSTIFY. (fill-region-as-paragraph): Obey left-margin; fill-prefix starts after left-margin. Disable filling if JUSTIFY == none, but indent to margin anyway. Adaptive-fill removes text-props from fill-prefixes it finds. Adaptive-fill no longer has to notice left-margin: std fill does that. Use fill-column and canonically-space-region functions. (canonically-space-region): New fn split from fill-region-as-paragraph. (fill-region): New args NOSQUEEZE (as above) and TO-EOP. (default-justification): New variable. (current-left-margin, fill-column, justification): New functions. (fill-paragraph): Use fill-region-as-paragraph when possible. (justify-current-line): New arguments; different kinds of justification handled. Uses left-margin and fill-column functions.

#!/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