diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-05-29 08:59:39 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-05-29 08:59:39 +0000 |
| commit | 8e73a6ce75a115b1fd411d5a3a987d599a7dcc4b (patch) | |
| tree | e5e320e2ce9e6fbc0cc00927dffa60894f87b709 /ext | |
| parent | f2a1269383c19a2d6d9fd475681b34e5e81e65e3 (diff) | |
* regex.c (re_compile_pattern): no back reference to a
subexpression if inside of it.
* eval.c (rb_yield_0): preserve and restore ruby_cref as well.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/tk/lib/tk.rb | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index 262adec3f2..b1ab35598f 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -665,6 +665,10 @@ module TkPackage include TkCore extend TkPackage + def add_path(path) + Tk::AUTO_PATH.value = Tk::AUTO_PATH.to_a << path + end + def forget(package) tk_call('package', 'forget', package) nil @@ -726,9 +730,6 @@ module Tk TK_LIBRARY = INTERP._invoke("set", "tk_library") LIBRARY = INTERP._invoke("info", "library") - TCL_PACKAGE_PATH = INTERP._invoke("set", "tcl_pkgPath") - AUTO_PATH = tk_split_simplelist(INTERP._invoke("set", "auto_path")) - PLATFORM = Hash[*tk_split_simplelist(INTERP._eval('array get tcl_platform'))] JAPANIZED_TK = (INTERP._invoke("info", "commands", "kanji") != "") @@ -1379,6 +1380,21 @@ class TkVarAccess<TkVariable end end +module Tk + begin + auto_path = INTERP._invoke('set', 'auto_path') + rescue + begin + auto_path = INTERP._invoke('set', 'env(TCLLIBPATH)') + rescue + auto_path = Tk::LIBRARY + end + end + AUTO_PATH = TkVarAccess.new('auto_path', auto_path) + + TCL_PACKAGE_PATH = TkVarAccess.new('tcl_pkgPath') +end + module TkSelection include Tk extend Tk |