diff -rNC3 smalltalk-2.1/examples/regex.c smalltalk-2.1.work/examples/regex.c
*** smalltalk-2.1/examples/regex.c	Mon Sep 30 19:08:52 2002
--- smalltalk-2.1.work/examples/regex.c	Fri Apr 11 22:30:15 2003
***************
*** 1522,1531 ****
  	  while ((int) b[-1] > 0 && b[b[-1] - 1] == 0)
  	    b[-1]--;
  	  if (b[-1] != (1 << BYTEWIDTH) / BYTEWIDTH)
! 	    memmove (&b[b[-1]], &b[(1 << BYTEWIDTH) / BYTEWIDTH],
  		     2 +
  		     EXTRACT_UNSIGNED (&b[(1 << BYTEWIDTH) / BYTEWIDTH]) * 8);
! 	  b += b[-1] + 2 + EXTRACT_UNSIGNED (&b[b[-1]]) * 8;
  	  break;
  
  	case '(':
--- 1522,1531 ----
  	  while ((int) b[-1] > 0 && b[b[-1] - 1] == 0)
  	    b[-1]--;
  	  if (b[-1] != (1 << BYTEWIDTH) / BYTEWIDTH)
! 	    memmove (&b[(int) b[-1]], &b[(1 << BYTEWIDTH) / BYTEWIDTH],
  		     2 +
  		     EXTRACT_UNSIGNED (&b[(1 << BYTEWIDTH) / BYTEWIDTH]) * 8);
! 	  b += b[-1] + 2 + EXTRACT_UNSIGNED (&b[(int) b[-1]]) * 8;
  	  break;
  
  	case '(':
***************
*** 2093,2103 ****
  	      while ((int) b[-1] > 0 && b[b[-1] - 1] == 0)
  		b[-1]--;
  	      if (b[-1] != (1 << BYTEWIDTH) / BYTEWIDTH)
! 		memmove (&b[b[-1]], &b[(1 << BYTEWIDTH) / BYTEWIDTH],
  			 2 +
  			 EXTRACT_UNSIGNED (&b[(1 << BYTEWIDTH) / BYTEWIDTH]) *
  			 8);
! 	      b += b[-1] + 2 + EXTRACT_UNSIGNED (&b[b[-1]]) * 8;
  	      break;
  
  	    case 'w':
--- 2093,2103 ----
  	      while ((int) b[-1] > 0 && b[b[-1] - 1] == 0)
  		b[-1]--;
  	      if (b[-1] != (1 << BYTEWIDTH) / BYTEWIDTH)
! 		memmove (&b[(int) b[-1]], &b[(1 << BYTEWIDTH) / BYTEWIDTH],
  			 2 +
  			 EXTRACT_UNSIGNED (&b[(1 << BYTEWIDTH) / BYTEWIDTH]) *
  			 8);
! 	      b += b[-1] + 2 + EXTRACT_UNSIGNED (&b[(int) b[-1]]) * 8;
  	      break;
  
  	    case 'w':
diff -rNC3 smalltalk-2.1/libgst/dict.c smalltalk-2.1.work/libgst/dict.c
*** smalltalk-2.1/libgst/dict.c	Fri Apr 11 23:25:50 2003
--- smalltalk-2.1.work/libgst/dict.c	Fri Apr 11 19:41:11 2003
***************
*** 1273,1279 ****
      (gst_identity_dictionary) OOP_TO_OBJ (method_dictionary_oop);
  
  #ifndef OPTIMIZE
!   if (!IS_OOP_ADDR (ARRAY_AT (methodDictionary->values, index + 1))
      abort ();
  #endif
  
--- 1273,1279 ----
      (gst_identity_dictionary) OOP_TO_OBJ (method_dictionary_oop);
  
  #ifndef OPTIMIZE
!   if (!IS_OOP_ADDR (ARRAY_AT (methodDictionary->values, index + 1)))
      abort ();
  #endif
  
diff -rNC3 smalltalk-2.1/libgst/input.c smalltalk-2.1.work/libgst/input.c
*** smalltalk-2.1/libgst/input.c	Fri Apr 11 23:25:50 2003
--- smalltalk-2.1.work/libgst/input.c	Fri Apr 11 23:16:35 2003
***************
*** 1102,1109 ****
      }
  
    matches_left = high - current_index;
!   return matches_left ? completion_matches (text,
! 					    symbol_generator) : NULL;
  }
  
  int
--- 1102,1109 ----
      }
  
    matches_left = high - current_index;
!   return matches_left ? rl_completion_matches (text,
! 					       symbol_generator) : NULL;
  }
  
  int
diff -rNC3 smalltalk-2.1/snprintfv/gendoc.awk smalltalk-2.1.work/snprintfv/gendoc.awk
*** smalltalk-2.1/snprintfv/gendoc.awk	Fri Apr 11 23:25:50 2003
--- smalltalk-2.1.work/snprintfv/gendoc.awk	Fri Apr 11 22:18:24 2003
***************
*** 484,490 ****
  	    # Is this a printf attributable prototype?  Look for
  	    # ``format,'' in the penultimate argument:
  	    use_format=0;
! 	    if ($0 ~ /[^a-zA-Z_]format,[ \t]*\.\.\.)$/) {
  	        use_format=1;
  	    }
  
--- 484,490 ----
  	    # Is this a printf attributable prototype?  Look for
  	    # ``format,'' in the penultimate argument:
  	    use_format=0;
! 	    if ($0 ~ /[^a-zA-Z_]format,[ \t]*\.\.\.\)$/) {
  	        use_format=1;
  	    }
  
***************
*** 797,803 ****
  	        # %word becoming @code{}
      	        source = lines[i];
  	        dest = "";
! 	        while (match(source, /%[-+*/%<>!=()A-Za-z0-9_\\'"]+/)) {
  		    postchar="$"; # dummy for end of string
  		    if (RSTART + RLENGTH < length (source)) {
  		        postchar = substr(source, RSTART + RLENGTH, 1);
--- 797,803 ----
  	        # %word becoming @code{}
      	        source = lines[i];
  	        dest = "";
! 	        while (match(source, /%[-+*\/%<>!=()A-Za-z0-9_\\\'\"]+/)) {
  		    postchar="$"; # dummy for end of string
  		    if (RSTART + RLENGTH < length (source)) {
  		        postchar = substr(source, RSTART + RLENGTH, 1);
***************
*** 858,864 ****
  	        # %word becoming @code{}
      	        source = lines[i];
  	        dest = "";
! 	        while (match(source, /%[-+*/%<>!=()A-Za-z0-9_\\"']+/)) {
  		    postchar="$"; # dummy for end of string
  		    if (RSTART + RLENGTH < length (source)) {
  		        postchar = substr(source, RSTART + RLENGTH, 1);
--- 858,864 ----
  	        # %word becoming @code{}
      	        source = lines[i];
  	        dest = "";
! 	        while (match(source, /%[-+*\/%<>!=()A-Za-z0-9_\\\"\']+/)) {
  		    postchar="$"; # dummy for end of string
  		    if (RSTART + RLENGTH < length (source)) {
  		        postchar = substr(source, RSTART + RLENGTH, 1);
diff -rNC3 smalltalk-2.1/snprintfv/snprintfv/format.c smalltalk-2.1.work/snprintfv/snprintfv/format.c
*** smalltalk-2.1/snprintfv/snprintfv/format.c	Fri Apr 11 23:25:50 2003
--- smalltalk-2.1.work/snprintfv/snprintfv/format.c	Fri Apr 11 20:46:51 2003
***************
*** 1201,1207 ****
  
    /* Print to a stream using a user-supplied function. */
    fil = filnew (NULL, 0);
!   out = stream_new (fil, SNV_UNLIMITED, NULL, snv_filputc);
    user_func (out, pinfo, args);
    stream_delete (out);
    len = fillen (fil);
--- 1201,1207 ----
  
    /* Print to a stream using a user-supplied function. */
    fil = filnew (NULL, 0);
!   out = stream_new (fil, SNV_UNLIMITED, NULL, snv_fileputc);
    user_func (out, pinfo, args);
    stream_delete (out);
    len = fillen (fil);