diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-09-05 06:54:57 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-09-05 06:54:57 +0000 |
commit | 2e2786ccab636dd82de640bd771f2cc9fc20ab31 (patch) | |
tree | 0fc0c7632c71d722058b1f6c7ca513d57611086d /ext/tk | |
parent | 393f665e33782d4a91813abe599b1b28d675127d (diff) | |
download | ruby-2e2786ccab636dd82de640bd771f2cc9fc20ab31.tar.gz |
* re.c (Init_Regexp): to_s to be alias to inspect.
* parse.y (yylex): should support 'keyword='.
* ruby.c (proc_options): should not adjust argc/argv if -e option
is supplied.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk')
-rw-r--r-- | ext/tk/lib/tk.rb | 6 | ||||
-rw-r--r-- | ext/tk/lib/tktext.rb | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb index f10e8e23d8..e64a6b3af7 100644 --- a/ext/tk/lib/tk.rb +++ b/ext/tk/lib/tk.rb @@ -2233,7 +2233,7 @@ class TkObject<TkKernel def cget(slot) case slot - when 'text', 'label', 'show', 'data', 'flie' + when 'text', 'label', 'show', 'data', 'file' tk_call path, 'cget', "-#{slot}" else tk_tcl2ruby tk_call path, 'cget', "-#{slot}" @@ -2273,7 +2273,7 @@ class TkObject<TkKernel else if slot case slot - when 'text', 'label', 'show', 'data', 'flie' + when 'text', 'label', 'show', 'data', 'file' conf = tk_split_simplelist(tk_send('configure', "-#{slot}") ) else conf = tk_split_list(tk_send('configure', "-#{slot}") ) @@ -2285,7 +2285,7 @@ class TkObject<TkKernel conf = tk_split_simplelist(conflist) conf[0] = conf[0][1..-1] case conf[0] - when 'text', 'label', 'show', 'data', 'flie' + when 'text', 'label', 'show', 'data', 'file' else if conf[3] if conf[3].index('{') diff --git a/ext/tk/lib/tktext.rb b/ext/tk/lib/tktext.rb index 51b5d82b60..6ec738edb0 100644 --- a/ext/tk/lib/tktext.rb +++ b/ext/tk/lib/tktext.rb @@ -279,7 +279,7 @@ class TkText<TkTextWin def tag_cget(tag, key) case key - when 'text', 'label', 'show', 'data', 'flie' + when 'text', 'label', 'show', 'data', 'file' tk_call @path, 'tag', 'cget', tag, "-#{key}" else tk_tcl2ruby tk_call @path, 'tag', 'cget', tag, "-#{key}" @@ -308,7 +308,7 @@ class TkText<TkTextWin def tag_configinfo(tag, key=nil) if key case key - when 'text', 'label', 'show', 'data', 'flie' + when 'text', 'label', 'show', 'data', 'file' conf = tk_split_simplelist(tk_send('tag','configure',tag,"-#{key}")) else conf = tk_split_list(tk_send('tag','configure',tag,"-#{key}")) @@ -320,7 +320,7 @@ class TkText<TkTextWin conf = tk_split_simplelist(conflist) conf[0] = conf[0][1..-1] case conf[0] - when 'text', 'label', 'show', 'data', 'flie' + when 'text', 'label', 'show', 'data', 'file' else if conf[3] if conf[3].index('{') @@ -712,7 +712,7 @@ class TkTextTag<TkObject def cget(key) case key - when 'text', 'label', 'show', 'data', 'flie' + when 'text', 'label', 'show', 'data', 'file' tk_call @t.path, 'tag', 'cget', @id, "-#{key}" else tk_tcl2ruby tk_call @t.path, 'tag', 'cget', @id, "-#{key}" @@ -896,7 +896,7 @@ class TkTextWindow<TkObject def cget(slot) case slot - when 'text', 'label', 'show', 'data', 'flie' + when 'text', 'label', 'show', 'data', 'file' tk_call @t.path, 'window', 'cget', @index, "-#{slot}" else tk_tcl2ruby tk_call @t.path, 'window', 'cget', @index, "-#{slot}" @@ -947,7 +947,7 @@ class TkTextWindow<TkObject def configinfo(slot = nil) if slot case slot - when 'text', 'label', 'show', 'data', 'flie' + when 'text', 'label', 'show', 'data', 'file' conf = tk_split_simplelist(tk_call @t.path, 'window', 'configure', @index, "-#{slot}") else @@ -962,7 +962,7 @@ class TkTextWindow<TkObject conf = tk_split_simplelist(conflist) conf[0] = conf[0][1..-1] case conf[0] - when 'text', 'label', 'show', 'data', 'flie' + when 'text', 'label', 'show', 'data', 'file' else if conf[3] if conf[3].index('{') @@ -1017,7 +1017,7 @@ class TkTextImage<TkObject def cget(slot) case slot - when 'text', 'label', 'show', 'data', 'flie' + when 'text', 'label', 'show', 'data', 'file' tk_call @t.path, 'image', 'cget', @index, "-#{slot}" else tk_tcl2ruby tk_call @t.path, 'image', 'cget', @index, "-#{slot}" @@ -1046,7 +1046,7 @@ class TkTextImage<TkObject def configinfo(slot = nil) if slot case slot - when 'text', 'label', 'show', 'data', 'flie' + when 'text', 'label', 'show', 'data', 'file' conf = tk_split_simplelist(tk_call @t.path, 'image', 'configure', @index, "-#{slot}") else @@ -1061,7 +1061,7 @@ class TkTextImage<TkObject conf = tk_split_simplelist(conflist) conf[0] = conf[0][1..-1] case conf[0] - when 'text', 'label', 'show', 'data', 'flie' + when 'text', 'label', 'show', 'data', 'file' else if conf[3] if conf[3].index('{') |