more on cvs

[<don...@is...>]

well, I did manage to do cvs update, and for that I got a couple of
mangled files:
 Merging differences between 1.379 and 1.380 into stream.d
 rcsmerge: warning: conflicts during merge
 cvspserver server: conflicts found in clisp/src/stream.d
and
 Merging differences between 1.52 and 1.53 into unix.d
 rcsmerge: warning: conflicts during merge
 cvspserver server: conflicts found in clisp/src/unix.d

I guess I'm supposed to find things like this
 <<<<<<< unix.d
 /* START_NO_BLOCK() & END_NO_BLOCK() should appear in pairs inside
    {NO_BLOCK_DECL() ...} */
 #define NO_BLOCK_DECL()  int non_blocking_io = 1;
 =======
 /* START_NO_BLOCK() & END_NO_BLOCK() should appear in pairs
    inside { NO_BLOCK_DECL(); ... };
  NO_BLOCK_DECL() should be before the first statement,
    but after the last declaration */
 >>>>>>> 1.53
and, if they seem sufficiently similar, throw out the top one along
with the separator lines.
I'm assuming your versions are all better but wondering about the
interesting transformations like
   if ( fcntl(handle,F_SETFL,fcntl_flags) <0) { OS_error(); }
 =>
   do{if (fcntl(handle,F_SETFL,fcntl_flags)<0) {OS_error();}}while(0)


I don't understand why NO_BLOCK_DECL now seems to take an argument, 
but I've updated my uses of it.

Is output from this command ok?
cvs -z3 -d:pserver:ano...@cv...:/cvsroot/clisp diff -u clisp

[oh, no - now getting more of these ...
 cvs [diff aborted]: recv() from server cvs.sourceforge.net: EOF
]