* ext/tcltklib/tcltklib.c (ip_invoke): fixed bug on passing a exception

* ext/tk/lib/{tk.rb, tkcanvas.rb, tkfont.rb, tktext.rb} :
  bug fix and improvement of font control


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

1 files changed, 5 insertions, 1 deletions

diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c
index cb2036296a..ef91fcae3d 100644
--- a/ext/tcltklib/tcltklib.c
+++ b/ext/tcltklib/tcltklib.c
@@ -1313,7 +1313,11 @@ ip_invoke(argc, argv, obj)
     }
     if (eventloop_thread == 0 || current == eventloop_thread) {
 	DUMP2("invoke from current eventloop %lx", current);
-	return ip_invoke_real(argc, argv, obj);
+	result = ip_invoke_real(argc, argv, obj);
+	if (rb_obj_is_kind_of(result, rb_eException)) {
+	    rb_exc_raise(result);
+	}
+	return result;
     }
 
     DUMP2("invoke from thread %lx (NOT current eventloop)", current);