Mercurial > hg > xemacs-beta
annotate lib-src/vcdiff @ 930:eaedf30d9d76
[xemacs-hg @ 2002-07-23 08:34:59 by youngs]
2002-07-15 Jerry James <james@xemacs.org>
* make-docfile.c: Change whitespace and organization to reduce the
size of the diff against FSF Emacs sources and synch to Emacs 21.2.
Remove unused DO_REALLOC.
Mark XEmacs changes and additions more clearly.
Reintroduce previously deleted Emacs code inside #if 0 ... #endif.
* make-docfile.c (next_extra_elc): Replace goto with do-while.
* make-docfile.c (main): Put XEmacs-only args in one place.
* make-docfile.c (write_c_args): Change buff to buf to match
Emacs. Replace pointer arithmetic with simpler array syntax.
* make-docfile.c (scan_c_file): Note that DEFSIMPLE and DEFPRED no
longer exist. Correct the "name too long" test (off by one).
Die with message if a DEFUN has no docstring instead of hanging.
* make-docfile.c (scan_lisp_file): Introduce while loops used in
Emacs sources to skip consecutive blank lines.
2002-07-21 John Paul Wallington <jpw@xemacs.org>
* process.el (substitute-env-vars): New function; sync with
GNU Emacs 21.1.50.
(setenv): Add optional arg SUBSTITUTE-ENV-VARS; sync with
GNU Emacs 21.1.50.
2002-07-20 Mike Sperber <mike@xemacs.org>
* eval.c (run_post_gc_hook): Use more correct flags when running
post-gc-hook.
2002-07-20 Mike Sperber <mike@xemacs.org>
* process-unix.c (child_setup): Don't try to close file
descriptors for chid process once again---it's already being done
in close_process_descs.
(unix_create_process): Call begin_dont_check_for_quit to inhibit
unwanted interaction (and thus breaking of X event synchronicity)
in the child.
2002-07-15 Jerry James <james@xemacs.org>
* lisp.h: Make Qdll_error visible globally.
* symbols.c (check_sane_subr): Revert 2002-06-26 change.
Check only if !initialized.
* symbols.c (check_module_subr): Add parameter. Duplicate
check_sane_subr checks, but signal an error instead of asserting.
* symbols.c (defsubr): Use check_module_subr parameter.
* symbols.c (defsubr_macro): Ditto.
| author | youngs |
|---|---|
| date | Tue, 23 Jul 2002 08:35:11 +0000 |
| parents | 376386a54a3c |
| children | 061f4f90f874 06dd936cde16 |
| rev | line source |
|---|---|
| 0 | 1 #!/bin/sh |
| 2 # | |
| 3 # Enhanced sccs diff utility for use with vc mode. | |
| 4 # This version is more compatible with rcsdiff(1). | |
| 5 # | |
| 6 # !Id: vcdiff,v 1.4 1993/12/03 09:29:18 eggert Exp ! | |
| 7 # | |
| 8 # Modified by: vladimir@Eng.Sun.COM on 95-06-07 | |
| 9 # * Made sure that file arguments are specifed as s.<filename>. | |
| 10 # * Switched the assignments to $f inside the 3rd and 4th case statements of | |
| 11 # the first for-loop | |
| 12 # * Removed the incorrect initialization of sid1 before the first for-loop. | |
| 13 # | |
| 14 | |
| 15 DIFF="diff" | |
| 16 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..." | |
| 17 | |
| 18 PATH=$PATH:/usr/ccs/bin:/usr/sccs # common SCCS hangouts | |
| 19 | |
| 20 echo= | |
| 21 sid1= sid2= | |
| 22 | |
| 23 for f | |
| 24 do | |
| 25 case $f in | |
| 26 -*) | |
| 27 case $f in | |
| 28 --brief) | |
| 29 DIFF=cmp;; | |
| 30 -q) | |
| 31 echo=:;; | |
| 32 -r?*) | |
| 33 case $sid1 in | |
| 34 -r*) | |
| 35 sid2=$f | |
| 36 ;; | |
| 37 *) | |
| 38 case $sid2 in | |
| 39 ?*) echo "$usage" >&2; exit 2 ;; | |
| 40 esac | |
| 41 sid1=$f | |
| 42 ;; | |
| 43 esac | |
| 44 ;; | |
| 45 *) | |
| 46 options="$options $f" | |
| 47 ;; | |
| 48 esac | |
| 49 shift | |
| 50 ;; | |
| 51 *) | |
| 52 break | |
| 53 ;; | |
| 54 esac | |
| 55 done | |
| 56 | |
| 57 case $# in | |
| 58 0) | |
| 59 echo "$usage" >&2 | |
| 60 exit 2 | |
| 61 esac | |
| 62 | |
| 63 | |
| 64 rev1= rev2= status=0 | |
| 65 trap 'status=2; exit' 1 2 13 15 | |
| 66 trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0 | |
| 67 | |
| 68 for f | |
| 69 do | |
| 70 s=2 | |
| 71 | |
| 72 # For files under SCCS control, fixup the file name to be the s. filename | |
| 73 if [ -d SCCS ]; then | |
| 74 if [ $f = `echo $f | sed -e 's|SCCS/s.||'` ]; then | |
| 75 f="SCCS/s.$f" | |
| 76 fi | |
| 77 fi | |
| 78 | |
| 79 case $f in | |
| 80 s.* | */s.*) | |
| 81 if | |
| 82 rev1=/tmp/geta$$ | |
| 83 get -s -p -k $sid1 "$f" > $rev1 && | |
| 84 case $sid2 in | |
| 85 '') | |
| 86 workfile=`expr " /$f" : '.*/s.\(.*\)'` | |
| 87 ;; | |
| 88 *) | |
| 89 rev2=/tmp/getb$$ | |
| 90 get -s -p -k $sid2 "$f" > $rev2 | |
| 91 workfile=$rev2 | |
| 92 esac | |
| 93 then | |
| 94 $echo $DIFF $options $sid1 $sid2 $workfile >&2 | |
| 95 $DIFF $options $rev1 $workfile | |
| 96 s=$? | |
| 97 fi | |
| 98 ;; | |
| 99 *) | |
| 100 echo "$0: $f is not an SCCS file" >&2 | |
| 101 esac | |
| 102 | |
| 103 if test $status -lt $s | |
| 104 then status=$s | |
| 105 fi | |
| 106 done |