diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-11-19 04:58:09 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-11-19 04:58:09 +0000 |
| commit | fba998af1b17e852325c14cd0eaabed7beafb0fb (patch) | |
| tree | 5a94fed5e441970a8761231b0e5acb790fc3ac5c /ext | |
| parent | 3cff13cb2c8df5072edc90f99cf1631a0e5b86a5 (diff) | |
* parse.y (parse_regx): should raise error on untermitated
expression interpolation.
* pack.c (pack_unpack): should give length to utf8_to_uv().
* pack.c (utf8_to_uv): add length check.
* eval.c (rb_thread_wait_for): select may cause ERESTART on
Solaris.
* eval.c (rb_thread_select): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/extmk.rb.in | 2 | ||||
| -rw-r--r-- | ext/tk/lib/tk.rb | 25 | ||||
| -rw-r--r-- | ext/tk/lib/tkfont.rb | 4 |
3 files changed, 3 insertions, 28 deletions
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in index 5016447dbc..44a5e901bc 100644 --- a/ext/extmk.rb.in +++ b/ext/extmk.rb.in @@ -629,7 +629,7 @@ def extmake(target) if $static_ext.size > 0 || !File.exist?("./Makefile") || older("./Makefile", "#{$top_srcdir}/ext/@setup@") || - older("./Makefile", "../extmk.rb") || + older("./Makefile", "#{$topdir}/ext/extmk.rb") || older("./Makefile", "#{$top_srcdir}/ext/#{target}/makefile.rb") || older("./Makefile", "#{$top_srcdir}/ext/#{target}/extconf.rb") then diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index fb19252685..681b673ff8 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -1563,31 +1563,6 @@ module TkXIM end end -module TkXIM - include Tk - extend Tk - - def TkXIM.useinputmethods(window=nil,value=nil) - if window - if value - tk_call 'tk', 'useinputmethods', '-displayof', window.path, value - else - tk_call 'tk', 'useinputmethods', '-displayof', window.path - end - else - if value - tk_call 'tk', 'useinputmethods', value - else - tk_call 'tk', 'useinputmethods' - end - end - end - - def useinputmethods(value=nil) - TkXIM.useinputmethods(self,value) - end -end - module TkWinfo include Tk extend Tk diff --git a/ext/tk/lib/tkfont.rb b/ext/tk/lib/tkfont.rb index 65842e0188..c44b215ee9 100644 --- a/ext/tk/lib/tkfont.rb +++ b/ext/tk/lib/tkfont.rb @@ -691,10 +691,10 @@ class TkFont def metrics_core_tk8x(font, window, option=nil) if option if window - number(tk_call('font', 'metrics', font, "-#{option}")) - else number(tk_call('font', 'metrics', font, "-displayof", window, "-#{option}")) + else + number(tk_call('font', 'metrics', font, "-#{option}")) end else l = tk_split_list(if window |