diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-06 10:12:12 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-06 10:12:12 +0000 |
| commit | f2ba46eefaacbd786e0cd4bff8ed904008c15291 (patch) | |
| tree | e8e6f9b4257a9812c4abb589d23456c4a9cceb98 /ext/tk | |
| parent | 121de31d0331bd5310aad3d89cc0ad3883273d69 (diff) | |
Merge changes from ruby_1_8:
* ext/digest/lib/md5.rb (MD5::new, MD5::md5): Do not modify
Digest::MD5.
* ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
* lib/shell/process-controller.rb: fix thread synchronization
problem for [ruby-dev:30477].
* ext/digest/lib/md5.rb (MD5::new, MD5::md5): Catch up with
Digest's API changes; noted by: Kazuhiro Yoshida <moriq AT
moriq.com> in [ruby-dev:30500].
* ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
* time.c (time_to_s): Back out the format changes; discussed
in [ruby-dev:30495].
* ext/tk/sample/irbtkw.rbw: fails to exit process.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@12008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk')
| -rw-r--r-- | ext/tk/sample/irbtkw.rbw | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ext/tk/sample/irbtkw.rbw b/ext/tk/sample/irbtkw.rbw index 92fa5692f2..f6a35be6ed 100644 --- a/ext/tk/sample/irbtkw.rbw +++ b/ext/tk/sample/irbtkw.rbw @@ -26,7 +26,11 @@ console.yscrollbar(TkScrollbar.new(top, :width=>10).pack(:before=>console, :side=>:right, :expand=>false, :fill=>:y)) -ev_loop = Thread.new{Tk.mainloop} +irb_thread = nil +ev_loop = Thread.new{ + Tk.mainloop + irb_thread.kill if irb_thread +} # window position control root = Tk.root @@ -116,4 +120,5 @@ console.bind('Control-c'){ irb_thread.join # exit +ev_thread.kill Tk.exit |