diff --git a/ChangeLog b/ChangeLog index bbc7ffd683..be257c3967 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ -Sat Mar 28 00:47:19 1998 Yukihiro Matsumoto +Sat Mar 28 16:07:11 1998 WATANABE Hirofumi - * ruby.c (ruby_prog_init): `site_ruby' added to load_path. + * io.c (io_closed): should not cause exception fot closed IO. + + * string.c (str_tr): returned nil for success. + +Sat Mar 28 00:47:19 1998 Yukihiro Matsumoto * eval.c (f_local_variables): new method to return an array of local variable names. @@ -13,6 +17,10 @@ Sat Mar 28 00:47:19 1998 Yukihiro Matsumoto Fri Mar 27 13:49:27 1998 Yukihiro Matsumoto + * experimental release 1.1b9_05. + + * ruby.c (ruby_prog_init): `site_ruby' added to load_path. + * ruby.c (ruby_prog_init): load-path order changed. Paths in the RUBYLIB environment variable comes first in non-tainted mode. @@ -64,7 +72,7 @@ Fri Mar 20 16:40:34 1998 Yukihiro Matsumoto nil if it does not modify the string. * string.c (str_sub_iter_s): should check last pattern since it - may be matched to null. + may be matched to null. Thu Mar 19 13:48:55 1998 Yukihiro Matsumoto diff --git a/ext/tcltklib/extconf.rb b/ext/tcltklib/extconf.rb index 8032b1357b..201070c4dd 100644 --- a/ext/tcltklib/extconf.rb +++ b/ext/tcltklib/extconf.rb @@ -40,11 +40,10 @@ search_header("tk.h", "/usr/local/include/tk*", "/usr/local/include") search_header("X11/Xlib.h", + "/usr/include/X11*", "/usr/include", - "/usr/X11*/include", - "/usr/include", - "/usr/X11*/include", - "/usr/openwin/include") + "/usr/openwin/include", + "/usr/X11*/include") $CFLAGS = "-Wall " + $includes.collect{|path| "-I" + path}.join(" ") @@ -75,7 +74,7 @@ end if have_header("tcl.h") && have_header("tk.h") && search_lib("libX11.{a,so}", "XOpenDisplay", - "/usr/lib", "/usr/X11*/lib", "/usr/openwin/lib") && + "/usr/lib", "/usr/openwin/lib", "/usr/X11*/lib") && search_lib("libtcl{,7*,8*}.{a,so}", "Tcl_FindExecutable", "/usr/lib", "/usr/local/lib") && search_lib("libtk{,4*,8*}.{a,so}", "Tk_Init", diff --git a/io.c b/io.c index 9bda7a8d73..7e8310a714 100644 --- a/io.c +++ b/io.c @@ -739,8 +739,8 @@ io_closed(io) { OpenFile *fptr; - GetOpenFile(io, fptr); - return fptr->f?FALSE:TRUE; + fptr = RFILE(io)->fptr; + return (fptr->f || fptr->f2)?FALSE:TRUE; } static VALUE diff --git a/string.c b/string.c index e8a87fd2a4..e60088fd88 100644 --- a/string.c +++ b/string.c @@ -1824,7 +1824,7 @@ str_tr(str, src, repl) VALUE val = tr_trans(str_dup(str), src, repl, 0); if (NIL_P(val)) return str; - return Qnil; + return val; } static void diff --git a/version.h b/version.h index 6474e347cc..c0b8f6c198 100644 --- a/version.h +++ b/version.h @@ -1,2 +1,2 @@ #define RUBY_VERSION "1.1b9_05" -#define VERSION_DATE "98/03/26" +#define VERSION_DATE "98/03/27"