diff --git a/ChangeLog b/ChangeLog
index 7129c64a8e..0277e8c810 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,11 @@ Sat Nov 20 23:56:54 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/options.rb (Options::parse): Force --inline-source if
 	  --one-file option given
 
+Sat Nov 20 23:55:19 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_splice): should place index wrapping after
+	  possible modification.  [ruby-dev:24940]
+
 Sat Nov 20 23:25:12 2004  Minero Aoki  <aamine@loveruby.net>
 
 	* io.c (rb_io_getline): f.gets("") did not work. [ruby-core:03771]
@@ -40,6 +45,11 @@ Sat Nov 20 01:45:04 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 	* test/xmlrpc/test_webrick_server.rb : move `requrie "webrick/https"'
 	  into #setup_http_server mohtod to avoid soap test errors.
 
+Sat Nov 20 01:37:34 2004  Johan Holmberg  <holmberg@iar.se>
+
+	* eval.c (error_print): nicer traceback at interrupt.
+	  [ruby-core:03774]
+
 Sat Nov 20 00:07:16 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (str_gsub): internal buffer should not be listed by
diff --git a/eval.c b/eval.c
index 55ab01e4b8..e2651b5ca4 100644
--- a/eval.c
+++ b/eval.c
@@ -1148,6 +1148,7 @@ error_print()
 	if (elen == 0) {
 	    warn_print(": ");
 	    warn_print2(RSTRING(epath)->ptr, RSTRING(epath)->len);
+	    warn_print("\n");
 	}
 	else {
 	    char *tail  = 0;
diff --git a/string.c b/string.c
index 454959abc0..40f5eb224e 100644
--- a/string.c
+++ b/string.c
@@ -1628,6 +1628,10 @@ rb_str_splice(str, beg, len, val)
     VALUE val;
 {
     if (len < 0) rb_raise(rb_eIndexError, "negative length %ld", len);
+
+    StringValue(val);
+    rb_str_modify(str);
+
     if (RSTRING(str)->len < beg) {
       out_of_range:
 	rb_raise(rb_eIndexError, "index %ld out of string", beg);
@@ -1642,8 +1646,6 @@ rb_str_splice(str, beg, len, val)
 	len = RSTRING(str)->len - beg;
     }
 
-    StringValue(val);
-    rb_str_modify(str);
     if (len < RSTRING(val)->len) {
 	/* expand string */
 	RESIZE_CAPA(str, RSTRING(str)->len + RSTRING(val)->len - len + 1);