Mercurial > emacs
view lib-src/vcdiff @ 31190:85a616c90339
(set-face-attribute):
Update doc string.
(face-attribute-name-alist):
Add :inherit.
(face-valid-attribute-values):
Handle :inherit.
(face-read-string):
Rephrase prompt to be less confusing.
Assume that DEFAULT is a string, since we must return a string.
(face-read-integer):
Use `format' to turn DEFAULT into an acceptable default for face-read-string.
Match NEW-VALUE against the string "unspecified", not the symbol
`unspecified', since that's what face-read-string returns.
(read-face-attribute):
Lookup a name for old-value in valid, and use it as a default if we find one.
Treat all values from face-read-string as strings.
If the default is used, don't do any more processing on the value,
just use the old value directly.
(read-face-and-attribute, modify-face):
Tweak prompt.
(read-face-name):
Don't assume prompt ends with a space.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 26 Aug 2000 10:58:32 +0000 |
parents | 0ba6599135d6 |
children | c8fb06423da0 |
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.5 1995/07/07 22:47:57 eggert Exp $ # DIFF="diff" usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..." PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts echo= sid1= sid2= for f do case $f in -*) case $f in --brief) DIFF=cmp;; -q) echo=:;; -r?*) case $sid1 in '') 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