зеркало из https://github.com/github/ruby.git
fix typos inspired by r40825
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40829 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
66795c4774
Коммит
c54733e120
|
@ -496,7 +496,7 @@ Sat Nov 22 10:31:25 2008 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
|
|||
2005-04-08 ocean <ocean@ruby-lang.org>
|
||||
|
||||
* sample/tkextlib/treectrl/random.rb: fixed typo. (drop node outside of
|
||||
widget, or reenter widget while draggging)
|
||||
widget, or reenter widget while dragging)
|
||||
|
||||
2005-04-08 ocean <ocean@ruby-lang.org>
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ verbose = false
|
|||
|
||||
def help_msg
|
||||
print "Usage: #{$0} [-l] [-v] [-h] [--] [dir]\n"
|
||||
print "\tIf dir is omitted, check the directry that this command exists.\n"
|
||||
print "\tIf dir is omitted, check the directory that this command exists.\n"
|
||||
print "\tAvailable options are \n"
|
||||
print "\t -l : Add dir to $LOAD_PATH\n"
|
||||
print "\t (If dir == '<parent>/tkextlib', add <parent> also.)\n"
|
||||
|
|
|
@ -23,7 +23,7 @@ TkButton.new(page2CS, :text=>'Button Two').pack
|
|||
# Select the first page of the tabnotebook.
|
||||
nb.select(0)
|
||||
|
||||
# Create the scrollbar and associate teh scrollbar
|
||||
# Create the scrollbar and associate the scrollbar
|
||||
# and the notebook together, then pack the scrollbar
|
||||
nb.scrollbar(TkScrollbar.new).pack(:fill=>:y, :expand=>true, :pady=>10)
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ TkButton.new(page2CS, :text=>'Button Two').pack
|
|||
# Select the first page of the tabnotebook.
|
||||
nb.select(0)
|
||||
|
||||
# Create the scrollbar and associate teh scrollbar
|
||||
# Create the scrollbar and associate the scrollbar
|
||||
# and the notebook together, then pack the scrollbar
|
||||
nb.xscrollbar(TkScrollbar.new).pack(:fill=>:x, :expand=>true, :padx=>10)
|
||||
|
||||
|
|
|
@ -356,7 +356,7 @@ class GetoptLong
|
|||
#
|
||||
def terminate
|
||||
return nil if @status == STATUS_TERMINATED
|
||||
raise RuntimeError, "an error has occured" if @error != nil
|
||||
raise RuntimeError, "an error has occurred" if @error != nil
|
||||
|
||||
@status = STATUS_TERMINATED
|
||||
@non_option_arguments.reverse_each do |argument|
|
||||
|
|
|
@ -889,7 +889,7 @@ module Net
|
|||
|
||||
def initialize(sock)
|
||||
@socket = sock
|
||||
@error_occured = false
|
||||
@error_occurred = false
|
||||
res = check_response(critical { recv_response() })
|
||||
@apop_stamp = res.slice(/<[!-~]+@[!-~]+>/)
|
||||
end
|
||||
|
@ -1007,11 +1007,11 @@ module Net
|
|||
end
|
||||
|
||||
def critical
|
||||
return '+OK dummy ok response' if @error_occured
|
||||
return '+OK dummy ok response' if @error_occurred
|
||||
begin
|
||||
return yield()
|
||||
rescue Exception
|
||||
@error_occured = true
|
||||
@error_occurred = true
|
||||
raise
|
||||
end
|
||||
end
|
||||
|
|
|
@ -215,7 +215,7 @@ module Net
|
|||
@started = false
|
||||
@open_timeout = 30
|
||||
@read_timeout = 60
|
||||
@error_occured = false
|
||||
@error_occurred = false
|
||||
@debug_output = nil
|
||||
@tls = false
|
||||
@starttls = false
|
||||
|
@ -605,17 +605,17 @@ module Net
|
|||
rescue SMTPError
|
||||
if @esmtp
|
||||
@esmtp = false
|
||||
@error_occured = false
|
||||
@error_occurred = false
|
||||
retry
|
||||
end
|
||||
raise
|
||||
end
|
||||
|
||||
def do_finish
|
||||
quit if @socket and not @socket.closed? and not @error_occured
|
||||
quit if @socket and not @socket.closed? and not @error_occurred
|
||||
ensure
|
||||
@started = false
|
||||
@error_occured = false
|
||||
@error_occurred = false
|
||||
@socket.close if @socket and not @socket.closed?
|
||||
@socket = nil
|
||||
end
|
||||
|
@ -942,11 +942,11 @@ module Net
|
|||
end
|
||||
|
||||
def critical
|
||||
return '200 dummy reply code' if @error_occured
|
||||
return '200 dummy reply code' if @error_occurred
|
||||
begin
|
||||
return yield()
|
||||
rescue Exception
|
||||
@error_occured = true
|
||||
@error_occurred = true
|
||||
raise
|
||||
end
|
||||
end
|
||||
|
|
|
@ -253,7 +253,7 @@ def next_token # :nodoc:
|
|||
[:STRINGLINE, line]
|
||||
end
|
||||
else
|
||||
raise "[BUG] parsing error may occured."
|
||||
raise "[BUG] parsing error may occurred."
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -359,7 +359,7 @@ module WEBrick
|
|||
begin
|
||||
body{|chunk| } # read remaining body
|
||||
rescue HTTPStatus::Error => ex
|
||||
@logger.error("HTTPRequest#fixup: #{ex.class} occured.")
|
||||
@logger.error("HTTPRequest#fixup: #{ex.class} occurred.")
|
||||
@keep_alive = false
|
||||
rescue => ex
|
||||
@logger.error(ex)
|
||||
|
|
|
@ -430,7 +430,7 @@ class CGIServer < BasicServer
|
|||
</head>
|
||||
<body>
|
||||
<h1>#{err}</h1>
|
||||
<p>Unexpected error occured while processing XML-RPC request!</p>
|
||||
<p>Unexpected error occurred while processing XML-RPC request!</p>
|
||||
</body>
|
||||
</html>
|
||||
MSGEND
|
||||
|
@ -505,7 +505,7 @@ class ModRubyServer < BasicServer
|
|||
</head>
|
||||
<body>
|
||||
<h1>#{err}</h1>
|
||||
<p>Unexpected error occured while processing XML-RPC request!</p>
|
||||
<p>Unexpected error occurred while processing XML-RPC request!</p>
|
||||
</body>
|
||||
</html>
|
||||
MSGEND
|
||||
|
|
|
@ -3312,7 +3312,7 @@ rb_fork_internal(int *status, int (*chfunc)(void*, char *, size_t), void *charg,
|
|||
int err, state = 0;
|
||||
int ep[2];
|
||||
VALUE exc = Qnil;
|
||||
int error_occured;
|
||||
int error_occurred;
|
||||
|
||||
if (status) *status = 0;
|
||||
|
||||
|
@ -3358,8 +3358,8 @@ rb_fork_internal(int *status, int (*chfunc)(void*, char *, size_t), void *charg,
|
|||
#endif
|
||||
}
|
||||
close(ep[1]);
|
||||
error_occured = recv_child_error(ep[0], &state, &exc, &err, errmsg, errmsg_buflen, chfunc_is_async_signal_safe);
|
||||
if (state || error_occured) {
|
||||
error_occurred = recv_child_error(ep[0], &state, &exc, &err, errmsg, errmsg_buflen, chfunc_is_async_signal_safe);
|
||||
if (state || error_occurred) {
|
||||
if (status) {
|
||||
rb_protect(proc_syswait, (VALUE)pid, status);
|
||||
if (state) *status = state;
|
||||
|
|
|
@ -41,6 +41,6 @@ end
|
|||
status = MyApp.new(1, 2, 3).start
|
||||
|
||||
if status != 0
|
||||
puts 'Some error(s) occured.'
|
||||
puts 'Some error(s) occurred.'
|
||||
puts 'See "app.log".'
|
||||
end
|
||||
|
|
Загрузка…
Ссылка в новой задаче