1.2.6 repack

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@495 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 18 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index eaff8a7e4c..fda43b45f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jul 15 12:09:33 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* version 1.2.6 (repacked).
+
+Wed Jul  7 18:27:41 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
+
+	* st.c (st_delete_safe): was modifying wrong slot.
+
 Mon Jun 21 15:29:31 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
 	* version 1.2.6 (1.2 final) released.
@@ -80,7 +88,7 @@ Mon Apr 19 18:56:21 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 	* regex.c (IS_A_LETTER): a byte sequence shorter than mbc should
 	  not match with \w etc.
 
-Fri Apr 16 21:40:43 1999  Nobuetsu Nokada  <gea02117@nifty.ne.jp>
+Fri Apr 16 21:40:43 1999  Nobuyoshi Nakada  <gea02117@nifty.ne.jp>
 
 	* io.c (f_backquote): pipe_open may return nil.
 
@@ -126,7 +134,7 @@ Fri Mar 12 12:27:55 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 	* parse.y (parse_regx): need not to push backslashes before
 	  escaped characters.
 
-Sun Mar  7 14:21:32 1999  IKARASHI Akira <ikarashi@itlb.te.noda.sut.ac.jp>
+Sun Mar  7 14:21:32 1999  IKARASHI Akira  <ikarashi@itlb.te.noda.sut.ac.jp>
 
 	* string.c (rb_str_index): wrong end point calculation.
 
@@ -221,7 +229,7 @@ Tue Jan 19 05:01:16 1999  Koji Arai  <JCA02266@nifty.ne.jp>
 
 	* array.c (beg_len): round range value too much.
 
-Mon Jan 18 13:02:27 1999  Kuroda Jun  <jkuro@dwe.co.j>
+Mon Jan 18 13:02:27 1999  Kuroda Jun  <jkuro@dwe.co.jp>
 
 	* hash.c (env_keys): strchr() may return NULL.
 
@@ -559,7 +567,7 @@ Sat Aug 29 16:31:40 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
 	* regex.c (re_compile_pattern): mask \nnn over 256.
 
-Sat Aug 29 02:09:46 1998 1998  Koji Arai  <JCA02266@nifty.ne.jp>
+Sat Aug 29 02:09:46 1998  Koji Arai  <JCA02266@nifty.ne.jp>
 
 	* sprintf.c (f_sprintf): wrong buffer size check.
 
@@ -1093,7 +1101,7 @@ Thu May 14 14:03:16 1998  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
 	* random.c (f_rand): use drand48 if possible.
 
-Wed May 13 19:05:20 1998 1998  MAEDA shugo  <shugo@aianet.ne.jp>
+Wed May 13 19:05:20 1998  MAEDA shugo  <shugo@aianet.ne.jp>
 
 	* BeOS patches for io.c, error.c and config.guess.
 
diff --git a/ext/kconv/kconv.c b/ext/kconv/kconv.c
index 048719b39f..969c2cb504 100644
--- a/ext/kconv/kconv.c
+++ b/ext/kconv/kconv.c
@@ -592,7 +592,7 @@ do_kconv(in, out, out_code, in_code)
     inptr = (unsigned char *)RSTRING(in)->ptr;	/* input buffer */
     inlen = RSTRING(in)->len;			/* input buffer size*/
     outptr = RSTRING(out)->ptr;			/* output buffer */
-    outsiz = RSTRING(in)->len;			/* output buffer size */
+    outsiz = RSTRING(out)->len;			/* output buffer size */
     outlen = 0;		/* current length of output string */
 
     if (inlen <= 0) {
@@ -1885,7 +1885,7 @@ kconv_tosjis(obj, src)
 /*
  * Character code detection - Algorithm described in:
  * Ken Lunde. `Understanding Japanese Information Processing'
- * Sebastopol, CA: O'Reilly & Associates.
+ * O'Reilly & Associates, Sebastopol, CA.
  */
 
 static VALUE
diff --git a/st.c b/st.c
index 13f6558111..03ace90239 100644
--- a/st.c
+++ b/st.c
@@ -354,16 +354,8 @@ st_delete_safe(table, key, value, never)
 	return 0;
     }
 
-    if (EQUAL(table, *key, ptr->key)) {
-	table->num_entries--;
-	*key = ptr->key;
-	if (value != 0) *value = ptr->record;
-	ptr->key = ptr->record = never;
-	return 1;
-    }
-
-    for(; ptr->next != 0; ptr = ptr->next) {
-	if (EQUAL(table, ptr->next->key, *key)) {
+    for(; ptr != 0; ptr = ptr->next) {
+	if (EQUAL(table, ptr->key, *key)) {
 	    table->num_entries--;
 	    *key = ptr->key;
 	    if (value != 0) *value = ptr->record;
diff --git a/version.h b/version.h
index 4ea6d13a38..6e08632609 100644
--- a/version.h
+++ b/version.h
@@ -1,2 +1,2 @@
 #define RUBY_VERSION "1.2.6"
-#define VERSION_DATE "99/06/21"
+#define VERSION_DATE "99/07/15"