0 files changed, 0 insertions, 0 deletions
diff --git a/.cvsignore b/.cvsignore
index 9fd96ca149..52a5620133 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,10 +5,6 @@
 *~
 .ccmalloc
 .ppack
-.ext
-.git
-.svn
-.rbconfig.time
 COPYING.LIB
 ChangeLog.pre-alpha
 ChangeLog.pre1_1
diff --git a/COPYING b/COPYING
index 9043404a83..870a5f22d6 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
 You can redistribute it and/or modify it under either the terms of the GPL
-version 2 (see the file GPL), or the conditions below:
+(see the file GPL), or the conditions below:
 
   1. You may make and give away verbatim copies of the source form of the
      software without restriction, provided that you duplicate all of the
diff --git a/ChangeLog b/ChangeLog
index 7344ddb8e3..027f0c2a6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8945 +1,3 @@
-Thu Aug 16 04:39:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_initialize): should call rb_ary_modify() first.
-	  [ruby-core:11562]
-
-Thu Aug 16 04:38:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (yylex): return non-valid token for an invalid
-	  instance/class variable name.  a patch from from Yusuke ENDOH
-	  <mame AT tsg.ne.jp>.  [ruby-dev:31095]
-
-Thu Aug 16 04:36:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (dsym): return non-null NODE even if yyerror().  based on a
-	  patch from from Yusuke ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:31085]
-
-Thu Aug 16 04:34:56 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (proc_exec_v, rb_proc_exec): preserve errno.
-
-Thu Aug 16 04:30:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_path2class): get rid of dangling pointer caused by
-	  optimized out value.
-
-Thu Aug 16 04:24:28 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/dl/lib/dl/win32.rb: seems that dl doesn't accept void argument.
-	  fixed [ruby-bugs:PR#5489].
-
-Thu Aug 16 04:23:44 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser): handle more
-	  extensions.  [ruby-dev:30972]
-
-Thu Aug 16 04:14:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (ruby_setreuid, ruby_setregid): rename to get rid of name
-	  clash.
-Thu Aug 16 04:11:17 2007  Ryan Davis  <ryand@zenspider.com>
-
-	* lib/rexml/dtd/dtd.rb: Fixed typo in code. Fixes bug #10420
-
-Thu Aug 16 04:08:20 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (ResponseParser#next_token): fixed
-	  error message. (backported from HEAD)
-
-	* lib/net/imap.rb (ResponseParser#parse_error): fixed
-	  the condition not to refer @token.symbol unexpectedly.
-	  Thanks, Dick Monahan. (backported from HEAD)
-
-Thu Aug 16 04:05:20 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_extended): erroneous check condition when dump
-	  method is defined.  [ruby-core:10646]
-
-Sat Jun  9 10:40:00 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* stable version 1.8.5-p52 released.
-
-Thu Jun  7 14:53:46 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* eval.c (method_inspect): show proper class name.
-	  [ruby-talk:248647], Thanks Calamitas.
-
-Mon May 28 19:37:24 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (move_to_next_entry): revert r12338. not necessary
-	  on ruby_1_8_5.
-
-Sun May 27 05:52:37 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* eval.c (mnew): call of super via a method object should work again.
-	  [ruby-talk:248647], Thanks Calamitas.
-
-	* test/ruby/test_method.rb (TestMethod::test_method_super): test for
-	  above fix.
-
-Wed May 23 06:51:46 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* lib/cgi.rb (CGI#[]): get rid of exceptions being raised.
-	  [ruby-dev:30740], Thanks Kentaro KAWAMOTO.
-
-Wed May 23 06:14:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (move_to_next_entry): loc also must move forward.
-	  [ruby-talk:251987]
-
-Wed May 23 05:55:04 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (init_stdhandle): stderr should be without buffering,
-	  but mswin32 use buffering when stderr is not connected to tty.
-
-Wed May 23 03:33:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/monitor.rb (ConditionVariable#wait, mon_enter, mon_exit_for_cond):
-	  ensures Thread.critical to be false.  [ruby-talk:248300]
-
-Wed May 23 03:25:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* util.c (ruby_strtod): exponent is radix 10.  [ruby-talk:248272]
-
-Wed May 23 02:09:32 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_yield_0): should not clear state on TAG_NEXT when
-	  it's invoked from within lambda body.  [ruby-talk:248136]
-
-	* eval.c (proc_invoke): handle TAG_NEXT which would be caused by
-	  next in the lambda body as well.
-
-Wed May 23 01:55:49 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_fclose, rb_w32_close): need to save errno
-	  before calling original fclose()/close().
-
-Wed May 23 01:42:29 2007  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (disconnect): call shutdown for
-	  SSLSocket. Thanks, Technorama Ltd.
-
-Wed May 23 01:28:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (rb_notimplement), io.c (pipe_open): removed definite
-	  articles and UNIX manual section from messages.  [ruby-dev:30690]
-
-	* io.c (pipe_open): raise NotImplementedError for command "-" on
-	  platforms where fork(2) is not available.  [ruby-dev:30681]
-
-Wed May 23 00:06:19 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/socket.c (s_recv, s_recvfrom): some systems (such as
-	  windows) doesn't set fromlen if the socket is connection-oriented.
-	  reported by Bram Whillock in [ruby-core:10512] [ruby-Bugs#9061]
-
-Tue Mar 20 15:37:24 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* distruby.rb: Add zip generation.
-
-Fri Mar 16 21:48:11 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/dl/dl.c (rb_ary2cary): Fix a bug in type validation;
-	  submitted by sheepman <sheepman AT sheepman.sakura.ne.jp>
-	  in [ruby-dev:30554].
-
-Fri Mar 16 18:28:06 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/etc/etc.c (etc_getgrgid): Fix a bug in Etc::getgrgid()
-	  always returning the (real) group entry of the running process;
-	  reported by: UEDA Hiroyuki <ueda AT netforest.ad.jp>
-	  in [ruby-dev:30586].
-
-Wed Mar 14 12:30:00 2007  Shigeo Kobayashi  <shigeo@tinyforest.jp>
-
-	* ext/bigdecimal/bigdecimal.c: BigDecimal("-.31") is now
-	  treated as ("-0.31") not as ("0.31").
-
-Fri Mar 16 18:05:40 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/cgi.rb (CGI::header): IIS >= 5.0 does not need the nph
-	  assumption any more; submitted by MIYASAKA Masaru <alkaid AT
-	  coral.ocn.ne.jp> in [ruby-dev:30537].
-
-Tue Mar 13 17:29:43 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* stable version 1.8.5-p35 released.
-
-Tue Mar 13 14:42:10 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* test/fileutils/fileasserts.rb: Fix wrong error message.
-
-	* lib/fileutils.rb (FileUtils::mv): Type Error; should utilize
-	  Strings instead of Symbols here.
-
-Mon Mar 12 17:22:44 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/fileutils.rb (FileUtils::mv): fix incomplete backport of
-	  FileUtils.mv changes at r11988
-
-Mon Mar 12 16:09:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* mkconfig.rb (patchlevel): read from version.h.
-
-Sun Mar 11 18:57:50 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* misc/README: Add a note about ruby-electric.el. 
-
-	* misc/ruby-mode.el (ruby-non-block-do-re): Fix
-	  ruby-non-block-do-re. [ruby-core:03719]
-
-	* misc/inf-ruby.el: Synchronize the comment section with trunk.
-
-	* misc/README, misc/rdebug.el: Add rdebug.el, Emacs ruby-debug
-	  interface based on rubydb3x.el; submitted by Martin Nordholts
-	  <enselic AT gmail.com> in [ruby-bugs:PR#9023].
-
-Sun Mar 11 17:45:51 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/dl/mkcallback.rb (mkfunc): Make sure that a callback
-	  function is found in the function table before trying to call
-	  it; submitted by sheepman <sheepman AT sheepman.sakura.ne.jp>
-	  in [ruby-dev:30524].
-
-Tue Mar  6 18:58:37 2007  Keiju Ishitsuka  <keiju@ruby-lang.org>
-	
-	* lib/shell/process-controller.rb: fix thread synchronization
-	  problem for [ruby-dev:30477].
-	
-Sun Mar  4 23:53:27 2007  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (mv): could not move a directory between
-	  different filesystems. [ruby-dev:30411]
-
-Sat Mar  3 21:41:31 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* eval.c (stack_check): Unset inline to fix build with GCC 3.4.6;
-	  submitted by: NISHIMATSU Takeshi <t_nissie AT yahoo.co.jp> in
-	  [ruby-list:43218].
-	  cf. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24556
-
-Sat Mar  3 16:30:39 2007  Akinori MUSHA  <knu@iDaemons.org>
-
-	* env.h (SCOPE_CLONE): Introduce a new scope flag to prevent a
-	  local_tbl region from getting freed many times; submitted by
-	  Chikanaga Tomoyuki <chikanag AT nippon-control-system.co.jp> in
-	  [ruby-dev:30460].
-
-	* eval.c (proc_invoke): Ditto.
-
-	* gc.c (obj_free): Ditto.
-
-	* parse.y (top_local_setup_gen): Ditto.
-
-Sat Mar  3 15:41:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (stmt, arg): should not omit lhs of OP_ASGN1 even if
-	  empty.  [ruby-dev:30452]
-
-Wed Feb 28 20:51:32 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* pack.c (pack_unpack): properly ignore non-base64 octets such as
-	  UTF-8 encoded BOMs; submitted by SOUMA Yutaka <holon@radastery.jp>
-	  to fix [ruby-core:10437]
-
-Wed Feb 28 00:08:11 2007  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
-
-	* mkconfig.rb (RbConfig): add CONFIG['PATCHLEVEL']
-
-	* common.mk: new target dist
-
-	* distruby.rb: new file
-
-Tue Feb 27 21:19:35 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (set_pioinfo_extra): new function for VC++8 SP1
-	  workaround. [ruby-core:10259]
-
-	* win32/win32.c (NtInitialize): call above function.
-
-Mon Feb 26 09:57:58 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* signal.c (ruby_signal): don't set SA_RESTART.  a backport from
-	  the HEAD.  [ruby-talk:220937]  [ruby-talk:147220]
-
-Tue Feb 13 02:21:12 2007  Sam Roberts  <sroberts@uniserve.com>
-
-	* io.c (rb_f_syscall): Fix buffer overflow with syscall
-	  arguments.  [ruby-bugs:PR#8541]
-
-Sat Feb 10 09:33:47 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_variant2val): sorry, fix the enbug.
-
-Sat Feb 10 09:08:01 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_variant2val): fix compile error
-	  on VC++.
-
-Sat Feb 10 08:38:30 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_variant2val): fix the bug when
-	  SAFEARRAY pointer is NULL.
-
-Tue Feb  6 20:41:39 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* string.c (rb_str_sub_bang): calling rb_str_modify() should be just
-	  before actually modifying the string.
-	  fixed: [ruby-dev:30211] (originally reported by zunda)
-
-Sat Jan 27 15:20:11 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (dyna_var_lookup): should not alter dvar->val not to
-	  destroy living value.  [ruby-core:10076]
-
-	* parse.y (dyna_init): ditto.
-
-Wed Jan 24 18:05:39 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): fix
-	  regexp font-lock bug.  [ruby-talk:235758]
-
-Sun Jan 14 07:26:44 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_free, ole_type_free, 
-	  olemethod_free, olevariable_free, oleparam_free, 
-	  ole_event_free): fix memory leak.  [ruby-core:09846]
-
-Tue Jan  9 12:29:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/etc/etc.c (etc_getpwuid, etc_getgrgid): fix to correctly
-	  convert uid/gid from VALUE.
-
-	* ext/etc/etc.c (etc_getpwuid): ditto.
-
-Mon Dec 25 20:08:28 2006  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* ext/openssl/ossl.h: fixed compilation problem on gcc 3.2.
-	  [ruby-talk:214786]
-
-Mon Dec 25 10:40:40 2006  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* stable version 1.8.5-p12 released.
-
-Sat Dec 16 04:02:10 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c: shouldn't run the killed thread at callback.
-	  [ruby-talk: 227408]
-
-Fri Dec 15 17:21:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rdoc/ri/ri_options.rb: prevent NameError.  [ruby-dev:29597]
-
-Thu Dec 14 23:37:38 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (glob_helper): get rid of possible memory leak.
-
-	* win32/win32.c (cmdglob, rb_w32_cmdvector, rb_w32_opendir,
-	  rb_w32_get_environ): not to use GC before initialization.
-
-Wed Dec  6 19:53:41 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (SITE_DIR): fixed to emtpy RUBY_SITE_LIB in config.h on
-	  NetBSD.  fixed: [ruby-dev:29358]
-
-Mon Dec  4 10:43:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (dyna_init_gen): dvar initialization only if dvar is
-	  assigned inner block.  [ruby-talk:227402]
-
-Mon Dec  4 10:22:26 2006  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
-
-	* stable version 1.8.5-p2 released.
-
-Sun Dec  3 17:11:12 2006  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::QueryExtension::read_multipart): should quote
-	  boundary. JVN#84798830
-
-Sun Nov 26 16:36:46 2006  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* version.h: addition of RUBY_PATCHLEVEL.
-	* version.c: ditto.
-
-Fri Nov 24 10:17:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (bignorm): avoid segmentation.  a patch from Hiroyuki
-	  Ito <ZXB01226@nifty.com>.  [ruby-list:43012]
-
-Thu Nov  2 15:43:39 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* parse.y (primary): should set NODE even when compstmt is NULL.
-	  merge from trunk. fixed: [ruby-dev:29732]
-
-Sat Sep 23 21:34:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::QueryExtension::read_multipart): CGI content
-	  may be empty.  a patch from Jamis Buck <jamis at 37signals.com>.
-
-Mon Sep  4 21:43:57 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/dbm/extconf.rb: create makefile according to the result of check
-	  for dbm header.  fixed: [ruby-dev:29445]
-
-Tue Aug 29 19:10:10 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_hash_s_create): fixed memory leak, based on the patch
-	  by Kent Sibilev <ksruby at gmail.com>.  fixed: [ruby-talk:211233]
-
-Fri Aug 25 17:15:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* stable version 1.8.5 released.
-
-Fri Aug 25 17:02:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (gc_sweep): typo fixed.
-
-Tue Aug 22 18:47:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::handle_method):
-	  rdoc documents C module methods as instance methods. a patch in
-	  [ruby-core:08536]. 
-
-Sat Aug 19 14:15:02 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (config.status): include winsock2.h instead of
-	  winsock.h when --with-winsock2 is specified.
-	  fixed: [ruby-dev:29296]
-
-Sat Aug 19 11:28:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_s_rename): use errno if set properly.
-	  fixed: [ruby-dev:29293]
-
-Sat Aug 19 11:09:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (then): remove semicolon warning.  [ruby-dev:29299]
-
-Thu Aug 17 19:15:16 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_stat_[rRwWxX]): check for super user.
-	  fixed: [ruby-core:08616]
-
-Thu Aug 17 14:47:06 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb: added rdoc by Daniel Berger.  [ruby-core:08177]
-
-Thu Aug 17 00:39:05 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/ring.rb (do_reply): Fix for RingServer fails to find a
-	  TupleSpace when TupleSpace resides in the same ruby process with
-	  RingServer. a patch from Kent Sibilev. [ruby-core:08453]
-
-Wed Aug 16 11:45:36 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (proc_setuid, proc_setgid, proc_seteuid, proc_setegid):
-	  get rid of bogus implementations on Mac OS X.
-
-Tue Aug 15 19:10:18 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_class_comment): Fix
-	  broken class-level documentation.
-
-Wed Aug 16 11:09:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (set_arg0): fill argv other than the first with an empty
-	  string instead of NULL.
-
-Wed Aug 16 11:08:00 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.h: removed an excess macro.  fixed: [ruby-dev:29258]
-
-Tue Aug  8 23:49:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/irb/extend-command.rb (IRB::ExtendCommandBundle): pacify
-	  RDoc.  a patch from Eric Hodel <drbrain at segment7.net>.
-	  [ruby-core:08522]
-
-Tue Aug  8 11:32:54 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* Makefile.in, common.mk, configure.in: fix for platforms without
-	  rm. patches from Yutaka kanemoto <kinpoco at gmail.com>.
-	  [ruby-dev:29215]
-
-Mon Aug  7 17:56:59 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c, ext/digest/rmd160/rmd160ossl.c,
-	  ext/digest/sha1/sha1ossl.c, ext/readline/readline.c: move
-	  incluion of config.h to pacify AIX.  a patch from Yutaka
-	  Kanemoto <kinpoco at gmail.com>.  [ruby-dev:29197]
-
-Mon Aug  7 15:55:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/syck/syck.c (syck_move_tokens): should avoid negative
-	  memmove.  [ruby-list:42625]
-
-Mon Aug  7 14:37:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* configure.in, common.mk: AIX link issue.  a patch from Yutaka
-	  Kanemoto <kinpoco at gmail.com>.  [ruby-dev:29190]
-
-	* ext/socket/socket.c: AIX socket support.  [ruby-dev:29190]
-
-Mon Aug  7 12:05:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dln.c, eval.c, gc.c, regex.c, ruby.h: shut up AIX alloca
-	  warning.  a patch from Yutaka Kanemoto <kinpoco at gmail.com>.
-	  [ruby-dev:29191]
-
-Sun Aug  6 20:40:41 2006  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb (str[fp]time): %[EO]U didn't denote %U.
-
-Sat Aug  5 17:07:43 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (top_local_setup): local_vars[-1] should point
-	  ruby_scope itself to protect local_tbl from garbage collection.
-	  [ruby-dev:29049]
-
-Sat Aug  5 13:54:03 2006  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb (str[fp]time): "%\n" means "\n".
-
-Fri Aug  4 15:21:00 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib: Merge RDoc and .document from HEAD.
-	* lib/drb/ssl.rb: Close socket on SSLError [ruby-core:7197]
-
-Fri Aug  4 19:13:41 2006  Keiju Ishitsuka  <keiju@ruby-lang.org>
-
-	* lib/irb/{init.rb,ruby-lex.rb,slex.rb}: can't input '\c' for
-	  [ruby-core: 7122].
-
-Fri Aug  4 14:02:14 2006  James Edward Gray II  <james@grayproductions.net>
-
-	* lib/date/format.rb (__strptime, strftime): allow multi-line patterns
-	  in Date#strftime the same as Time#strftime accepts.
-	  fixed: [ruby-core:08466]
-
-Fri Aug  4 13:56:51 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* pack.c (pack_pack): check argument overrun for 'P'.  based on a
-	  patch by rucila <rucila at yahoo.cojp>.  fixed: [ruby-dev:29182]
-
-Tue Aug  1 17:44:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (init_stdhandle): assign standard file handles.
-
-Tue Aug  1 12:24:58 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (Init_Binding): fix old commit miss.
-
-Mon Jul 31 17:08:20 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (exit_handler): new function; release winsock and
-	  environment work area.
-
-	* win32/win32.c (NTInitialize): setup exit_handler.
-
-	* win32/win32.c (StartSockets): use exit_handler.
-
-	* win32/win32.c (rb_w32_getenv): use GetEnvironmentStrings() instead
-	  of GetEnvironmentVariable(), because the latter cannot distinguish
-	  wheather a null environment variable exists or not.
-	  fixed: [ruby-talk:205123]
-
-Mon Jul 31 16:15:13 2006  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_process.rb (TestProcess#test_rlimit_nofile):
-	  setrlimit may fail with EINVAL.
-	  reported by MIYAMUKO Katsuyuki.  [ruby-dev:29174]
-
-Mon Jul 31 13:38:22 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httprequest.rb (WEBrick::HTTPReuqest#parse_uri): improve
-	  for the value of IPv6 address in the Host: header field.
-
-Mon Jul 31 09:22:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.h: use ifdef (or defined) for macro constants that may or
-	  may not be defined to shut up gcc's -Wundef warnings.
-	  [ruby-core:08447]
-
-Sun Jul 30 23:26:22 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_call0): trace call/return of method defined from block.
-	  fixed: [ruby-core:08329]
-
-	* eval.c (rb_trap_eval): make the current thread runnable to deal with
-	  exceptions which occurred within the trap.  fixed: [ruby-dev:27729]
-
-	* lib/cgi/session.rb, lib/cgi/session/pstore.rb: suppress warnings.
-	  fixed: [ruby-talk:204896]
-
-Sat Jul 29 06:12:06 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: freeze ip_name for security reason.
-
-Sat Jul 29 01:23:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/logger.rb: improves the amount of documentation that Rdoc
-	  picks up when processing logger.rb by moving the require
-	  statement back before the comment block.  a patch from Hugh
-	  Sasse <hgs at dmu.ac.uk>.  [ruby-core:08422]
-
-Thu Jul 27 22:21:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* time.c (time_to_s): fixed format mismatch.
-
-Thu Jul 27 21:19:54 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* math.c (domain_check): a new function to check domain error
-	  explicitly for systems that return NaN like FreeBSD.
-	  [ruby-core:07019]
-
-	* math.c (math_acos, math_asin, math_acosh, math_atanh, math_log,
-	  math_log10, math_sqrt): use domain_check().
-
-	* math.c (math_sqrt): fix documentation flaw.
-
-Thu Jul 27 18:12:12 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* time.c: need to declare time_utc_offset.
-
-Thu Jul 27 17:01:01 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_close): always calls "close" method of the receiver.
-	  [ruby-core:6911] [ruby-core:8112]
-
-Thu Jul 27 16:49:01 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_to_s): use +0900 style timezone string for local time.
-	  [ruby-dev:29143]
-
-Thu Jul 27 16:41:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/openssl/ossl.h: move <ruby.h> inclusion point to shut up
-	  Solaris compiler.  [ruby-core:08114]
-
-Wed Jul 26 22:20:59 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* configure.in: add support for as and ASFLAGS.  [ruby-dev:29138]
-
-Wed Jul 26 22:13:45 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: sync with HEAD (rev 1.132).
-
-	* lib/net/http.rb (Net::HTTP#post, request_post, request): should
-	  set Content-Type: x-www-form-urlencoded by default.
-
-	* lib/net/http.rb (Net::HTTPHeader#content_type): should return
-	  nil when there's no Content-Type.
-
-	* lib/net/http.rb (Net::HTTPHeader#sub_type): should return nil
-	  when there's no sub Content-Type (e.g. "Content-Type: text").
-
-	* lib/net/http.rb (Net::HTTPHeader#type_params): wrongly failed
-	  when there's no Content-Type.
-
-Wed Jul 26 18:35:38 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/strscan/strscan.c: sync with HEAD (rev 1.25).
-
-	* ext/strscan/strscan.c (strscan_do_scan):
-	  StringScanner.new("").scan(//) should return "". [ruby-Bugs:4361]
-
-Wed Jul 26 18:14:19 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/pty/pty.c (getDevice): retry once after GC on failure.
-	  [ruby-core:08282]
-
-Wed Jul 26 17:28:16 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): prepend ".." to %u for negative bignum,
-	  but not "-".  fixed: [ruby-core:08167]
-
-Wed Jul 26 16:39:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_scan): add string modification check.
-	  [ruby-core:7216]
-
-Wed Jul 26 16:06:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::QueryExtension::read_multipart): check
-	  multipart boundary end.  a patch from Fujioka <fuj at rabbix.jp>
-	  [ruby-dev:28470]
-
-Wed Jul 26 01:02:59 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: suppress warnings by automake 1.8 or later.
-
-Tue Jul 25 00:30:06 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/prettyprint.rb: RD to RDoc conversion by Hugh Sasse.
-
-Tue Jul 25 14:49:51 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb (configuration): typo.
-
-Tue Jul 25 13:14:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (rb_proc_times): rename hz to hertz to avoid name
-	  crash on AIX.  [ruby-dev:29126]
-
-Mon Jul 24 22:03:40 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (backtrace): skip frames successive on node and method name.
-
-Mon Jul 24 17:55:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (rb_f_system): add security check.  [ruby-talk:202947]
-
-	* process.c (rb_f_system): move signal right before fork to avoid
-	  signal handler intervention.
-
-Mon Jul 24 15:51:52 2006  Tanaka Akira  <akr@fsij.org>
-
-	* ext/readline/readline.c (readline_readline): rl_deprep_term_function
-	  may be NULL with libedit.  reported by Ryan Davis.  [ruby-dev:29070]
-
-Mon Jul 24 15:19:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call0): revert last change.  [ruby-dev:29112]
-	  [ruby-core:08374]
-
-Sun Jul 23 22:59:49 2006  Tanaka Akira  <akr@fsij.org>
-
-	* test/socket/test_unix.rb: disabled on cygwin.
-	  reported by Kouhei Yanagita.  [ruby-dev:29080]
-
-Fri Jul 21 21:21:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_call0): include funcalled methods in caller list.
-	  fixed: [ruby-core:08290]
-
-Fri Jul 21 12:11:00 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb, lib/mkmf.rb (with_destdir): remove drive letter before
-	  prepending destdir on DOSISH.
-
-Thu Jul 20 15:07:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.h: export classes/modules to implement sandbox.
-	  [ruby-core:08283]
-
-Thu Jul 20 00:06:29 2006  Keiju Ishitsuka  <keiju@ishitsuka.com>
-
-	* lib/irb/completion.rb: support for completion of numeric
-    	  number. [ruby-dev: 29038]
-
-Wed Jul 19 23:53:05 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/parser.rb, lib/rss/utils.rb: added documents.
-
-Tue Jul 18 22:10:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (rb_f_system): block SIGCHLD during the process
-	  execution, like glibc system(3) does.  [ruby-talk:202361]
-
-Tue Jul 18 23:12:14 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (open_ifs_socket): should not use plain malloc.
-
-	* win32/win32.c (rb_w32_opendir): should not use plain realloc.
-
-Tue Jul 18 18:05:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/ruby/test_float.rb (TestFloat::test_strtod): update test to
-	  conform strtod change.
-
-Tue Jul 18 15:49:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (pack_unpack): propagate association array to copied
-	  string.  [ruby-core:08223]
-
-	* pack.c (pack_unpack): return referenced string itself if it has
-	  same length as specified.  a patch from <nobu at ruby-lang.org>
-	  in [ruby-core:08225].
-
-	* pack.c (pack_pack): taint 'p' packed strings.
-
-Tue Jul 18 14:03:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer::unmount): remove
-	  inpect argument from sprintf.  [ruby-dev:29039]
-
-Tue Jul 18 10:53:37 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_cstr_to_dbl): limit out-of-range message.
-
-	* util.c (ruby_strtod): return end pointer even if ERANGE occurred.
-	  fixed: [ruby-dev:29041]
-
-Mon Jul 18 00:43:05 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* util.c (ruby_strtod): stop at dot not followed by digits.
-	  fixed: [ruby-dev:29035]
-
-Tue Jul 18 00:01:27 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: remove LIBRUBY_SO if static linked extensions exist.
-
-Mon Jul 17 23:30:46 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rb_cv_msvcrt): defaulted to msvcrt.  Workaround for a
-	  bug of cygwin 1.5.20.
-
-Mon Jul 17 13:43:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (define_swapx): should not use plain malloc.
-
-Mon Jul 17 12:58:41 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: should use ac_cv_lib_dl_dlopen=no on MinGW.
-
-Sat Jul 15 23:50:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_require_safe): wait for another thread requiring the same
-	  feature.  fixed: [ruby-core:08229]
-
-Sat Jul 15 01:27:13 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (has_magic): glob names contain alphabets to enable case fold
-	  search also for directories.  fixed: [ruby-talk:201917]
-
-Sat Jul 15 01:09:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* st.c (malloc): use xmalloc/xcalloc instead of plain
-	  malloc/calloc, to detect memory allocation failure.  see
-	  <http://www.nongnu.org/failmalloc/>.
-
-	* gc.c (rb_memerror): should not raise empty nomem_error.
-
-Fri Jul 14 13:08:13 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: add methods for new features of latest Tcl/Tk8.5.
-
-	* ext/tk/lib/tk/namespace.rb: ditto.
-
-Fri Jul 14 02:30:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/monitor.rb: document patch from Hugh Sasse <hgs at dmu.ac.uk>.
-	  [ruby-core:08205]
-
-Fri Jul 14 01:09:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (then): error in warning action.
-
-Fri Jul 14 00:10:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_pop): may cause realloc oscillation.  a patch
-	  from MORITA Naoyuki <mlgetter at kidou.sakura.ne.jp>.
-	  [ruby-dev:29028]
-
-Thu Jul 13 22:23:56 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/composite.rb: improve handling of the classname on the
-	  option database for the widget class which includes TkComposite.
-
-Thu Jul 13 20:32:19 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/parser.rb: updated documents by a patch from
-	Hugh Sasse <hgs at dmu.ac.uk>. [ruby-core:8194]
-
-Wed Jul 12 13:54:09 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (then): we'd like to reserve colon here for the future.
-	  warning added.
-
-Tue Jul 11 20:58:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.h: export rb_cMethod.  [ruby-talk:201259]
-
-Tue Jul 11 19:13:33 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: remove restriction on the class of
-	  pseudo-toplevel.
-
-Tue Jul 11 18:00:57 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: security fix.
-
-Tue Jul 11 17:33:39 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* string.c (rb_str_dump): need to extend len for \b.
-
-Mon Jul 10 22:00:00 2006  Shigeo Kobayashi  <shigek@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c: Allows '_' to appear within
-	  digits.  [ruby-dev:28872]
-
-	* ext/bigdecimal/lib/bigdecimal/util.rb: Bug in to_r reported by
-	  [ruby-list:42533] fixed.
-
-Mon Jul 10 19:22:19 2006  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c (gc_sweep): expand heap earlier.
-	  reported by MORITA Naoyuki.  [ruby-dev:28960]
-
-Mon Jul 10 18:59:34 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/font.rb: sorry. mistaken to patch.
-
-Mon Jul 10 18:46:52 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c: make SEGV risk lower at exit.
-
-	* ext/tk/lib/tk.rb: ditto.
-
-	* ext/tk/lib/multi-tk.rb: fail to call function-style methods on slave
-	  interpreters. The strategy (MultiTkIp_PseudoToplevel_Evaluable) to
-	  fix the problem is a little tricky. You may have to take care of
-	  conflicting with it.
-
-	* ext/tk/lib/tk.rb: a little change for the pseudo-toplevel strategy.
-
-	* ext/tk/lib/tk/font.rb: ditto.
-
-	* ext/tk/lib/tk/msgcat.rb: ditto.
-
-	* ext/tk/lib/tkextlib/itk/incr_tk.rb: ditto.
-
-	* ext/tk/sample/demos-en/widget: fail to call function-style methods
-	  on sample scripts. To fix it, a strategy which similar to the way
-	  on MultiTiIp is used. Please take care when re-write and re-run a
-	  demo script on the Widget-Demo code viewer.
-
-	* ext/tk/sample/demos-jp/widget: ditto.
-
-Mon Jul 10 13:58:40 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* signal.c (ruby_nativethread_signal, posix_nativethread_signal,
-	  sigsend_to_ruby_thread, install_nativethread_sighandler):
-	  nativethread-support on signal handler. RE-backport from 1.9.
-
-	* ruby.h (HAVE_NATIVETHREAD_KILL): ditto.
-
-	* eval.c (ruby_native_thread_kill): ditto.
-
-Mon Jul 10 10:54:14 2006  Ryan Davis  <ryand@zenspider.com>
-
-	* lib/rdoc/parsers/parse_f95.rb: massive overhaul from Yasuhiro
-	  Morikawa including new file suffixes, function support, public
-	  variables and constants, derived-types, defined operators and
-	  assignments, namelists, and subroutine and function
-	  arguments. Truly massive.
-
-	* lib/rdoc/diagram.rb: diagrams are now cached.
-
-	* lib/irb/completion.rb: fixed a crasher when completing against
-	  an unnamed class/module.
-
-	* lib/rdoc/parsers/parse_c.rb: private comment (--/++) support in
-	  C-file rdoc.
-
-	* lib/debug.rb: minor clarification in help.
-
-	* lib/pp.rb: minor clarification on exception.
-
-Mon Jul 10 09:29:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_clear_cache_for_undef): clear entries for included
-	  module.  fixed: [ruby-core:08180]
-
-Mon Jul 10 01:48:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* st.h (st_data_t): use pointer sized integer for st_data_t.
-	  [ruby-dev:28988]
-
-Sun Jul  9 18:06:47 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (try_constant): fix for value 1 at cross compiling.
-
-	* lib/mkmf.rb (create_makefile): prevent substitution of macro
-	  definition.  fixed: http://www.yotabanana.com/lab/20060624.html#p02
-
-Sun Jul  9 00:54:34 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (next_jump): deal with destination of next.
-	  fixed: [ruby-core:08169]
-
-Fri Jul  7 00:38:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_default): should not call default procedure if
-	  no key is given.  [ruby-list:42541]
-
-Fri Jul  7 00:29:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_mload): a patch from Daniel Berger
-	  <Daniel.Berger at qwest.com>.  [ruby-core:08128]
-
-Thu Jul  6 22:21:57 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (rb_proc_times): use sysconf(_SC_CLK_TCK) value prior to
-	  HZ and CLK_TCK.  fixed: [ruby-talk:200293]
-
-Thu Jul  6 22:17:21 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/racc/cparse/cparse.c: sync with original code, rev 1.8.
-
-	* ext/racc/cparse/cparse.c: should mark CparseParams objects.
-
-	* lib/racc/parser.rb: sync with original code, rev 1.8.
-
-	* lib/racc/parser.rb: update coding style.
-
-Mon Jul  3 19:04:38 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c (ip_make_menu_embeddable): help to make a menu
-	  widget embeddable (pack, grid, and so on) like as a general widget.
-	  However, an embeddable menu may require to be definied some event
-	  bindings for general use.
-
-	* ext/tk/lib/tk/event.rb: [bug fix] Tk.callback_break and
-	  Tk.callback_continue don't work on MultiTkIp.
-
-	* ext/tk/lib/multi-tk.rb: ditto.
-
-	* ext/tk/lib/tk.rb: lack of Tk.callback_return.
-
-	* ext/tk/lib/tk/menu.rb: improve creating clone menus.
-
-Mon Jul  3 14:42:06 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/etc/extconf.rb (PW_UID2VAL, PW_GID2VAL): defaulted to conversion
-	  from int, and sys/types.h needs to be included before grp.h.
-	  fixed: [ruby-dev:28938]
-
-Mon Jul  3 01:14:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_inspect): encode \b (\010) for escape.
-	  [ruby-dev:28927]
-
-	* string.c (rb_str_dump): ditto.
-
-Sun Jul  2 19:17:56 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/racc/cparse/cparse.c: sync with original code (rev 1.7).
-
-	* ext/racc/cparse/cparse.c: use rb_catch instead of rb_iterate.
-	  Giving a block to a Ruby-level method by rb_iterate is obsolete on
-	  Ruby 1.9.  Note that current cparse.c still includes one
-	  rb_iterate call on Ruby 1.8, but it is not a problem (at least
-	  just now).
-
-Sat Jul  1 15:15:49 2006  Tanaka Akira  <akr@m17n.org>
-
-	* test/socket/test_nonblock.rb: add timeout to send/receive
-	  an empty UDP packet.
-	  [ruby-dev:28820]
-
-Fri Jun 30 23:46:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* configure.in: should test isinf for Solaris with GCC compiler.
-	  a patch from <ville.mattila at stonesoft.com>.  [ruby-core:07791]
-
-	* configure.in: -shared patch from Andrew Morrow
-	  <andrew.c.morrow at gmail.com>.  [ruby-core:08100]
-
-Thu Jun 29 18:58:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_version): fix patch
-	  failure.
-
-Thu Jun 29 18:00:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c: add RDoc document.  a patch from
-	  mathew <meta at pobox.com>.   [ruby-core:07050]
-
-Wed Jun 28 15:47:14 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/optparse.rb: RDoc patch from Robin Stocker <robin@nibor.org>
-	  [ruby-core:08087]
-
-Wed Jun 28 19:04:34 2006  Tanaka Akira  <akr@m17n.org>
-
-	* test/socket/test_unix.rb: test_seqpacket_pair removed.
-	  [ruby-dev:28846]
-
-Tue Jun 27 23:03:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c: RDoc update for =~ method.  a patch from Alex Young
-	  <alex at blackkettle.org>.  [ruby-core:08068]
-
-Tue Jun 27 22:47:18 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c: forgot to update TCLTKLIB_RELEASE_DATE.
-
-	* ext/tk/lib/tk.rb (tk_tcl2ruby): [bug fix] sometimes fail to convert
-	  a tcl string to a ruby object if the tcl string includes "\n".
-
-Tue Jun 27 16:04:05 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* win32/win32.h: define isascii on MinGW for msvcrt compatibility.
-
-	* configure.in: set ac_cv_header_sys_time_h=no on MinGW
-	  for msvcrt compatibility.
-
-Tue Jun 27 11:36:02 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/etc/etc.c (setup_passwd, setup_group): allow bignum uid, gid and
-	  so on.  [ruby-talk:199102]
-
-Mon Jun 26 13:37:27 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc: Merge from HEAD.
-	  Add options to limit the ri search path.
-
-Tue Jun 27 00:54:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* util.c (powersOf10): constified.
-
-Mon Jun 26 18:37:44 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c (ip_delete): fix SEGV when a slave-ip is
-	  deleted on callback.
-
-Mon Jun 26 10:47:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (pipe_open): avoid closing uninitialized file descriptors.
-	  a patch from <tommy at tmtm.org> [ruby-dev:28600]
-
-Mon Jun 26 09:56:22 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.[ch] (rb_w32_send, rb_w32_sendto): constified.
-
-Sun Jun 25 23:02:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in, mkconfig.rb: catch-up for latest autoconf.
-
-Sat Jun 24 06:35:00 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* signal.c: revert last change.
-
-	* ruby.h: ditto.
-
-	* eval.c: ditto.
-
-Thu Jun 22 11:52:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/net/http.rb (Net::HTTPResponse): duplicated error 501;
-	  HTTPInternalServerError should be error 500.  [ruby-core:08037]
-
-Thu Jun 22 05:15:58 2006  Tanaka Akira  <akr@m17n.org>
-
-	* ext/socket/socket.c (sock_s_socketpair): try GC only once.
-	  [ruby-dev:28778]
-
-Wed Jun 21 21:28:32 2006  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb (jd_to_commercial): now works fine even if in
-	  mathn-ized context.
-
-Wed Jun 21 17:32:31 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* signal.c (ruby_nativethread_signal, posix_nativethread_signal,
-	  sigsend_to_ruby_thread, install_nativethread_sighandler):
-	  nativethread-support on signal handler (backport from 1.9).
-
-	* ruby.h (HAVE_NATIVETHREAD_KILL): ditto.
-
-	* eval.c (ruby_native_thread_kill): ditto.
-
-Wed Jun 21 08:39:54 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): merge Date
-	  and Time processing.  [ruby-core:08033]
-
-Wed Jun 21 01:40:25 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (yylex, reswords): modifier token is no longer returned in
-	  fname state.  [ruby-dev:28775]
-
-Wed Jun 21 01:12:46 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: RSS::Element.def_corresponded_attr_writer
-	  supported date type.
-
-Tue Jun 20 22:08:36 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rss/test_parser.rb: split parser tests into ...
-	* test/rss/test_parser_1.0.rb: ... RSS 1.0 parsing tests and ...
-	* test/rss/test_parser_2.0.rb: ... RSS 2.0 parsing tests.
-
-Tue Jun 20 21:19:06 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: provided default RSS::Element#children.
-
-	* lib/rss/0.9.rb: used default RSS::Element#children.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-
-Tue Jun 20 21:04:33 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: provided default RSS::Element#_tags.
-
-	* lib/rss/0.9.rb: used default RSS::Element#_tags.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-
-Tue Jun 20 20:47:07 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: hide RSS::Element.install_model.
-	  (RSS::Element.install_have_child_element,
-	   RSS::Element.install_have_children_element,
-	   RSS::Element.install_text_element,
-	   RSS::Element.install_date_element): call
-	  RSS::Element.install_model internally.
-
-	* lib/rss/0.9.rb: followed new API.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/content.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
-
-Tue Jun 20 20:18:05 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: add check for OBJ_NAME_do_all_sorted.
-
-	* ext/openssl/ossl_cipher.c (ossl_s_ciphers): new method
-	  OpenSSL::Cipher.ciphers. it returns all the cipher names.
-
-	* ext/openssl/lib/openssl/cipher.rb:
-	  - add constants AES128, AES192, AES256. [ruby-dev:28610]
-	  - reimplement without eval()
-
-	* ext/openssl/lib/openssl/digest.rb: reimplement without eval().
-
-	* test/openssl/test_cipher.rb, test_digest: fix about reimplemented
-	  features.
-
-	* sample/openssl/cipher.rb: rewrite all.
-
-Sat Jun 19 11:21:46 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/test/unit/assertions.rb: Merge RDoc from HEAD.
-
-Tue Jun 20 01:06:57 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb:
-	  - cleanup validation mechanism. Now, #XXX_validation is
-	    needless.
-	  - changed internal variable name RSS::Element::MODEL to
-	    RSS::Element::MODELS.
-	  - RSS::Element.install_model requires uri.
-
-	* lib/rss/0.9.rb: followed new validation API.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/content.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
-
-Mon Jun 19 23:40:59 2006  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/lib/kconv.rb: remove default -m0 and fix document.
-
-	* ext/nkf/nkf-8/{nkf.c, config.h, utf8tbl.c, utf8tbl.h}:
-	  imported nkf 2.0.7.
-
-Mon Jun 19 22:31:59 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb:
-	  - provided default #to_s as RSS::Element#to_s.
-	  - removed RSS::Element#other_element.
-	  - RSS::Element#tag requires attributes as Hash instead of Array.
-
-	* lib/rss/0.9.rb: removed #to_s to use RSS::Element#to_s.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
-
-	* lib/rss/2.0.rb: removed #other_element.
-
-Mon Jun 19 22:09:16 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c(ole_invoke): support some kind of
-	  method of word. [ruby-Bugs#3237]
-
-	* ext/win32ole/tests/test_word.rb: ditto.
-
-	* ext/win32ole/tests/testall.rb: ditto.
-
-Mon Jun 19 00:02:17 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: automatically detected attributes.
-
-	* lib/rss/0.9.rb: removed #_attrs.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
-
-	* lib/rss/parser.rb: followed new internal API.
-
-Mon Jun 19 00:00:17 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: fix bug: initialize improper tables.
-
-Sun Jun 18 22:36:13 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: RSS::Element#initialize accepts initial
-	  attributes.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
-
-	* lib/rss/utils.rb: added Utils.element_initialize_arguments? to
-	  detect backward compatibility initial arguments.
-
-	* lib/rss/parser.rb: user initial attributes to initialize
-	  RSS::Element.
-
-Sun Jun 18 18:24:42 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/converter.rb: use NKF for Uconv fallback.
-
-Sun Jun 18 18:22:04 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rss/test_image.rb: shared name space configuration.
-
-Sun Jun 18 18:13:25 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: improved ignore_unknown_element
-	  handling. RSS::NotExpectedTagError provides tag URI.
-	* lib/rss/parser.rb: ditto.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/content.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
-
-	* test/rss/rss-assertions.rb: checked URI of not expected tag too.
-	* test/rss/test_parser.rb: ditto.
-
-Sun Jun 18 18:08:36 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: changed empty namespace URI representation to ""
-	  from nil.
-	* lib/rss/parser.rb: ditto.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-
-Sun Jun 18 18:03:50 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/parser.rb: removed a guard for requiring open-uri.
-
-Sun Jun 18 18:01:26 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: fixed typo: except -> expect
-	* lib/rss/parser.rb: ditto.
-	* test/rss/rss-assertions.rb: ditto.
-	* test/rss/test_parser.rb: ditto.
-
-Sun Jun 18 17:52:39 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: RSS::Element#calc_indent became to be deprecated.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
-
-	* test/rss/test_1.0.rb: removed RSS::Element.indent_size tests.
-	* test/rss/test_2.0.rb: ditto.
-
-Sun Jun 18 00:49:11 2006  Tanaka Akira  <akr@m17n.org>
-
-	* ext/socket/socket.c (bsock_recv_nonblock): new method
-	  BasicSocket#recv_nonblock.
-	  (udp_recvfrom_nonblock): renamed from ip_recvfrom_nonblock.
-	  IPSocket#recvfrom_nonblock is moved to UDPSocket#recvfrom_nonblock.
-	  (unix_recvfrom_nonblock): removed.
-	  UNIXSocket#recvfrom_nonblock is removed.
-
-Sat Jun 17 22:17:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/mathn.rb (Integer::prime_division): raise ZeroDivisionError
-	  on zeros.  [ruby-dev:28739]
-
-Sat Jun 17 14:53:32 2006  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb: backport from 1.9.
-	  (Kernel#Pathname): new method.
-
-Sat Jun 17 10:30:41 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (Hash#merge, Enumerable#sort_by): removed.
-
-	* lib/rss/rss.rb (RSS::RootElementMixin#to_xml): added.
-	  [ruby-talk:197284]
-
-	  We can convert RSS version easily like the following:
-	    rss10 = RSS::Parser.parse(File.read("1.0.rdf"))
-	    File.open("2.0.rss", "w") {|f| f.print(rss10.to_xml("2.0"))}
-
-	* test/rss/test_1.0.rb: added #to_xml test.
-	* test/rss/test_2.0.rb: ditto.
-
-	* test/rss/rss-testcase.rb: added some helper methods that
-	  generates sample RSS 2.0.
-
-	* sample/rss/convert.rb: added a sample script to convert RSS format.
-
-Sat Jun 17 10:23:22 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (Kernel#funcall): removed.
-	* lib/rss/parser.rb (Kernel.URI): removed.
-
-	* lib/rss/maker/: supported
-	    xxx.new_yyy do |yyy|
-	      yyy.zzz = zzz
-	      ...
-	    end
-	  style and this style became the style of the recommendation.
-
-	  Old style
-	    yyy = xxx.new_yyy
-	    yyy.zzz = zzz
-	    ...
-	  is supported too but this style isn't recommended.
-	  [ruby-talk:197284]
-
-	* test/rss/test_*maker*.rb: used new recommended style.
-
-Sat Jun 17 09:03:47 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss, test/rss: backported from trunk. (2005-11-16 - now)
-
-	* lib/rss/rss.rb (RSS::VERSION): 0.1.5 -> 0.1.6.
-	* test/rss/test_version.rb (RSS::TestVersion#test_version): ditto.
-
-	* lib/rss/trackback.rb: added TrackBack prefix.
-	* lib/rss/maker/trackback.rb: ditto.
-
-	* lib/rss/rss.rb : removed needless argument 'prefix'.
-	* lib/rss/parser.rb: ditto.
-
-	* lib/rss/1.0.rb: added rdf:Bag.
-
-	* lib/rss/taxonomy.rb: implemented taxonomy module.
-	* test/rss/test_taxonomy.rb: added tests for taxonomy support.
-
-	* lib/rss/1.0.rb: added convenience method 'resources'.
-	* lib/rss/taxonomy.rb: ditto.
-	* test/rss/rss-assertions.rb: added test for 'resources'.
-	* test/rss/test_taxonomy.rb: ditto.
-
-	* lib/rss/rss.rb: fixed a indentation bug.
-	* lib/rss/taxonomy.rb: fixed <taxo:topic> #to_s bug.
-	* test/rss/test_taxonomy.rb: added a #to_s test.
-
-	* lib/rss/maker/taxonomy.rb: implemented taxonomy module for RSS
-	  Maker.
-	* lib/rss/taxonomy.rb: supported RSS Maker.
-	* lib/rss/maker.rb: added taxonomy module support.
-
-	* lib/rss/rss.rb: adjusted to other element API.
-	* lib/rss/1.0.rb: adjusted to other element API but backward
-	  compatibility is reserved.
-	* lib/rss/0.9.rb: ditto.
-
-	* test/rss/test_maker_taxo.rb: added test case for taxonomy module
-	  for RSS Maker.
-	* test/rss/test_setup_maker_1.0.rb: added tests for taxo:topic.
-
-	* test/rss/test_setup_maker_1.0.rb: added backward compatibility
-	  test.
-	* test/rss/test_setup_maker_0.9.rb: ditto.
-	* test/rss/test_setup_maker_2.0.rb: ditto.
-
-	* test/rss/rss-testcase.rb: added convenience method for setting
-	  up taxo:topic.
-	* test/rss/rss-assertions.rb: added assertion for taxo:topic.
-
-	* sample/rss/blend.rb: followed new API.
-
-	* lib/rss/taxonomy.rb: changed class or module prefix to
-	  Taxonomy from Taxo.
-	* lib/rss/maker/taxonomy.rb: ditto.
-
-	* test/rss/test_taxonomy.rb: use #reject directory.
-
-	* lib/rss/: use #__send__ instead of #send.
-	* test/rss/: ditto.
-
-	* lib/rss/parser.rb: added entity handling type predicate.
-	* lib/rss/rexmlparser.rb: ditto.
-	* lib/rss/xmlparser.rb: ditto.
-	* lib/rss/xmlscanner.rb: ditto.
-
-	* lib/rss/xmlscanner.rb: more robust entity handling.
-
-	* test/rss/test_parser.rb: added an entity handling test.
-
-	* test/rss/test_2.0.rb: added RSS 2.0 tests.
-	* test/rss/rss-assertions.rb: extended XML stylesheet assertion.
-	* lib/rss/0.9.rb: added initialize method.
-	* test/rss/test_1.0.rb: cleanup.
-
-	* lib/rss/image.rb: added Image prefix.
-	* lib/rss/maker/image.rb: ditto.
-
-	* lib/rss/rss.rb: improved type conversion.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
-
-	* test/rss/test_2.0.rb: added type conversion tests.
-	* test/rss/test_accessor.rb: ditto.
-	* test/rss/test_to_s.rb: ditto.
-	* test/rss/test_syndication.rb: ditto.
-	* test/rss/test_setup_maker_2.0.rb: ditto.
-	* test/rss/test_setup_maker_1.0.rb: ditto.
-	* test/rss/test_setup_maker_0.9.rb: ditto.
-	* test/rss/test_maker_sy.rb: ditto.
-	* test/rss/test_maker_image.rb: ditto.
-	* test/rss/test_maker_2.0.rb: ditto.
-	* test/rss/test_maker_0.9.rb: ditto.
-	* test/rss/test_image.rb: ditto.
-
-	* test/rss/test_maker_1.0.rb: use assert instead of assert_equal.
-
-	* test/rss/rss-assertions.rb: improved type conversion assertions.
-
-	* lib/rss/rss.rb: added backward compatibility codes.
-	* lib/rss/parser.rb: ditto.
-	* test/rss/test_parser.rb: ditto.
-	* test/rss/test_2.0.rb: ditto.
-
-Sat Jun 17 02:01:00 2006  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb (Kernel#pretty_inspect): defined for pretty printed
-	  string.
-
-Sat Jun 17 00:23:58 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (reswords): kDO_BLOCK was missing.  fixed: [ruby-core:7995]
-
-Sat Jun 17 00:02:15 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_propertyput): support
-	  PROPERTYPUTREF. [ruby-talk:183042]
-
-	* ext/win32ole/tests/test_propertyputref.rb: ditto.
-
-Thu Jun 15 23:02:47 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (fole_methods): The return value
-	  of WIN32OLE#ole_methods should include PROPERTYPUTREF methods.
-
-	* ext/win32ole/win32ole.c (fole_put_methods): The return value
-	  of WIN32OLE#ole_put_methods should include PROPERTYPUTREF methods.
-
-	* ext/win32ole/tests/test_ole_methods.rb: ditto.
-
-	* ext/win32ole/tests/testall.rb : ditto.
-
-Wed Jun 14 18:23:28 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* enum.c (enum_any): Documentation typo.
-
-Wed Jun 14 15:01:09 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser#warn): Don't print
-	  warnings when -q is set.
-
-Wed Jun 14 23:03:53 2006  Tanaka Akira  <akr@m17n.org>
-
-	* configure.in: check sizeof(rlim_t).
-	  check setrlimit.
-
-	* process.c (proc_getrlimit): new method Process.getrlimit.
-	  (proc_setrlimit): new method Process.setrlimit.
-
-	* ruby.h (NUM2ULL): new macro.
-
-Mon Jun 12 22:25:09 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): adjust precision length to prevent
-	  splitting multi-byte characters.  [ruby-list:42389]
-
-Sun Jun 11 23:20:07 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser::Arguable#getopts): pass self to the
-	  parser.
-
-Sun Jun 11 10:00:57 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.h (write): not need to define on bcc.
-
-Sun Jun 11 08:30:33 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser#getopts): new methods.
-
-Sat Jun 10 18:02:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/bigdecimal/lib/bigdecimal/newton.rb (Newton::nlsolve): typo
-	  fixed: raize -> raise.  [ruby-talk:196608]
-
-Thu Jun  8 14:19:17 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.[ch] (rb_w32_read, rb_w32_write): new functions.
-	  use recv() and send() when fd is socket. fixed: [ruby-dev:28694]
-
-Wed Jun  7 16:22:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
-	  basename and pid.  [ruby-talk:196272]
-
-Wed Jun  7 14:53:04 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (errmap): add some winsock errors.
-
-Wed Jun  7 11:34:38 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* configure.in: add new configure option `--with-winsock2' for mingw.
-
-	* win32/Makefile.sub (config.h): define USE_WINSOCK2 in config.h
-	  instead of in CPPFLAGS.
-
-	* ext/socket/extconf.rb: determine whether to use winsock2 or not
-	  by using with_config.
-
-Wed Jun  7 10:45:10 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/{configure.bat, setup.mak, Makefile.sub, win32.h}: add
-	  new configure option `--with-winsock2'.
-
-	* win32/win32.c (StartSockets): ditto.
-
-	* ext/socket/extconf.rb: ditto.
-
-	* win32/win32.c (open_ifs_socket): new function.
-
-	* win32/win32.c (StartSockets, rb_w32_socket): use open_ifs_socket()
-	  instead of socket().
-	  ifs socket support is backported from trunk.
-
-Wed Jun  7 09:14:44 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call0): binding for the return event hook should have
-	  consistent scope.  [ruby-core:07928]
-
-	* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
-	  event_hooks.	no guarantee for arbitrary hook deletion.
-	  [ruby-dev:28632]
-
-Mon Jun  5 18:12:12 2006  Tanaka Akira  <akr@m17n.org>
-
-	* ext/socket/socket.c (sock_s_unpack_sockaddr_in): reject
-	  non-AF_INET/AF_INET6 sockaddr.
-	  (sock_s_unpack_sockaddr_un): reject non-AF_UNIX sockaddr.
-	  [ruby-dev:28691]
-
-Sun Jun  4 20:40:19 2006  Tanaka Akira  <akr@m17n.org>
-
-	* ext/socket/socket.c: fix sockaddr_un handling.
-	  [ruby-dev:28677]
-
-Fri Jun  2 22:08:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/forwardable.rb: RDoc typo fix from Jan Svitok
-	  <jan.svitok at gmail.com>.  [ruby-core:07943]
-
-Fri Jun  2 19:02:09 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: use create_header.
-
-	* ext/openssl/ossl.h, ext/openssl/openssl_missing.h:
-	  include RUBY_EXTCONF_H.
-
-Fri Jun  2 17:16:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (CLEANINGS): remove extconf.h by distclean if created.
-
-Fri Jun  2 00:11:19 2006  Tanaka Akira  <akr@m17n.org>
-
-	* ext/socket/socket.c (s_recvfrom): alen may be zero with UNIXSocket
-	  too.  (tested on NetBSD 3.0)
-	  (s_recvfrom_nonblock): extracted from sock_recvfrom_nonblock.
-	  (sock_recvfrom_nonblock): use s_recvfrom_nonblock.
-	  (ip_recvfrom_nonblock): new method: IPSocket#recvfrom_nonblock
-	  (unix_recvfrom_nonblock): new method: UNIXSocket#recvfrom_nonblock
-	  (s_accept_nonblock): extracted from sock_accept_nonblock.
-	  (sock_accept_nonblock): use s_accept_nonblock.
-	  (tcp_accept_nonblock): new method: TCPServer#accept_nonblock
-	  (unix_accept_nonblock): new method: UNIXServer#accept_nonblock
-
-Thu Jun  1 19:12:37 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_cmdvector): backslashes inside single-quotes
-	  no longer has special meanings.  fixed: [ruby-list:42311]
-
-Thu Jun  1 16:14:41 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_getcwd): runtime's getcwd() will not success
-	  if the length of the cwd is longer than MAX_PATH.
-	  fixed [ruby-list:42335]
-
-Thu Jun  1 11:29:14 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_getcwd): set errno if not set.
-	  fixed [ruby-list:42346]
-
-Sat May 27 11:29:46 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (extmake): remove extinit files if no statically linked
-	  extensions.
-
-Fri May 26 09:05:11 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
-
-	* ruby.h, lib/mkmf.rb (create_header): clear command line options for
-	  macros moved to extconf.h.
-
-	* ext/extmk.rb (extract_makefile, extmk): made RUBY_EXTCONF_H and
-	  EXTSTATIC permanent.
-
-	* ext/{dbm,digest/*,socket,zlib}/extconf.rb: used $defs and $INCFLAGS.
-
-	* {bcc32,win32,wince}/Makefile.sub (COMPILE_C, COMPILE_CXX): added
-	  $(INCFLAGS).
-
-	* lib/mkmf.rb (configuration): add $defs unless extconf.h was created.
-
-Thu May 25 01:52:07 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (pkg_config): particular config commands support.
-
-	* ext/extmk.rb: deal with $static set in extconf.rb.
-
-	* mkconfig.rb: merge multiple entries to an entry with multiple lines.
-
-	* lib/mkmf.rb: allow a series of commands to link.
-
-	* win32/Makefile.sub: embed manifests.
-
-	* win32/setup.mak: suffix OS name by runtime version.
-
-Wed May 24 23:52:11 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
-
-	* configure.in (ac_install_sh): ignore dummy install-sh.
-	  [ruby-talk:193876]
-
-Wed May 24 03:10:48 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/openssl/ssl.rb
-	  (OpenSSL::SSL::SocketForwarder#setsockopt,getsockopt): typo fixed.
-
-Mon May 22 17:54:12 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/socket.c (sock_recvfrom_nonblock): use rb_read_pending
-	  instead of rb_io_read_pending.
-	  [ruby-dev:28663]
-
-Mon May 22 17:30:04 2006  Tanaka Akira  <akr@m17n.org>
-
-	* rubyio.h (rb_io_set_nonblock): declared.
-
-	* io.c (rb_io_set_nonblock): new function.
-	  (io_getpartial): nonblocking read support.
-	  (io_read_nonblock): new method: IO#read_nonblock.
-	  (io_write_nonblock): new method: IO#write_nonblock.
-
-	* ext/socket/socket.c
-	  (sock_connect_nonblock): new method: Socket#connect_nonblock.
-	  (sock_accept_nonblock): new method: Socket#accept_nonblock.
-	  (sock_recvfrom_nonblock): new method: Socket#recvfrom_nonblock.
-
-	  [ruby-core:7917]
-
-Mon May 22 15:57:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (umethod_bind): should not update original class.
-	  [ruby-dev:28636]
-
-Mon May 22 13:38:57 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (ev_const_get): should support constant access from
-	  within instance_eval().  [ruby-dev:28327]
-
-Thu May 18 17:51:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_timeval): should round for usec floating
-	  number.  [ruby-core:07896]
-
-	* time.c (time_add): ditto.
-
-Thu May 18 17:11:45 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::out): support utf-8.  a patch from Fujioka
-	  <fuj at rabbix.jp>.  [ruby-dev:28649]
-
-Thu May 18 00:42:12 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb, lib/mkmf.rb: use BUILD_FILE_SEPARATOR in Makefiles.
-
-Wed May 17 17:55:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (sys_warning): should not call a vararg function
-	  rb_sys_warning() indirectly.  [ruby-core:07886]
-
-Wed May 17 08:17:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* util.c (ruby_strtod): try to reduce errors using powersOf10
-	  table.  [ruby-dev:28644]
-
-Tue May 16 15:34:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_initialize): should not allow modifying literal
-	  regexps.  frozen check moved from rb_reg_initialize_m as well.
-
-Tue May 16 09:20:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_initialize): should not modify untainted objects in
-	  safe levels higher than 3.
-
-	* re.c (rb_memcmp): type change from char* to const void*.
-
-	* dir.c (dir_close): should not close untainted dir stream.
-
-	* dir.c (GetDIR): add tainted/frozen check for each dir operation.
-
-Mon May 15 17:42:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
-	  typo fixed.  a patch from Florian Gross <florg at florg.net>.
-
-Sat May 13 16:14:05 2006  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb (PP.mcall): new method.
-	  (Struct#pretty_print): call Kernel#class and Struct#members even if
-	  overridden.
-	  (Struct#pretty_print_cycle): ditto.
-	  [ruby-core:7865]
-
-Thu May 11 19:57:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* util.c (ruby_strtod): differ addition to minimize error.
-	  [ruby-dev:28619]
-
-Fri Aug 11 15:39:25 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
-	  documented.
-
-Thu May 11 18:10:43 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* util.c (ruby_strtod): should not raise ERANGE when the input
-	  string does not have any digits.  [ruby-dev:28629]
-
-Sun May  7 03:09:51 2006  Stephan Maka  <stephan@spaceboyz.net>
-
-	* lib/resolv.rb (Resolv::DNS::Requester::ConnectedUDP#initialize):
-	  Use AF_INET6 for nameservers containing colons.
-
-Sat May  6 00:38:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* signal.c (trap): sig should be less then NSIG.  Coverity found
-	  this bug.  a patch from Kevin Tew <tewk at tewk.com>.
-	  [ruby-core:07823]
-
-Thu May  4 02:24:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
-	  uninitialized array element.  a patch from Pat Eyler
-	  <rubypate at gmail.com>.  [ruby-core:07809]
-
-	* array.c (rb_ary_fill): initialize local variables first.  a
-	  patch from Pat Eyler <rubypate at gmail.com>.  [ruby-core:07810]
-
-	* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
-	  type_tag.  a patch from Pat Eyler <rubypate at gmail.com>.
-	  [ruby-core:07808]
-
-Wed May  3 02:12:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (make_hostent_internal): accept ai_family
-	  check from Sam Roberts <sroberts at uniserve.com>.
-	  [ruby-core:07691]
-
-Mon May  1 12:23:19 2006    <sinara@blade.nagaokaut.ac.jp>
-
-	* numeric.c (num_div): use floor rather than rb_Integer().
-	  [ruby-dev:28589]
-
-	* numeric.c (flo_divmod): the first element of Float#divmod should
-	  be an integer. [ruby-dev:28589]
-
-	* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
-
-Sat Apr 29 22:42:08 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_decode0): should initialize
-	  flag. [ruby-core:07785]
-
-Fri Apr 28 10:53:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* util.c (ruby_strtod): should not cut off 18 digits for no
-	  reason.  [ruby-core:07796]
-
-	* util.c (ruby_strtod): fixed wrong conversion.
-
-Thu Apr 27 01:38:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_fill): internalize local variable "beg" to
-	  pacify Coverity.  [ruby-core:07770]
-
-Wed Apr 26 16:59:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (pack_unpack): now supports CRLF newlines.  a patch from
-	  <tommy at tmtm.org>.  [ruby-dev:28601]
-
-Tue Apr 25 18:00:05 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c (delete_slaves): maybe increment the reference
-	  count of a NULL Tcl_Obj [ruby-core:07759].
-
-Tue Apr 25 07:55:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/jcode.rb (String::tr_s): should have translated non
-	  squeezing character sequence (i.e. a character) as well.  thanks
-	  to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
-
-Tue Apr 25 00:08:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_compile_pattern): should check if c is not a
-	  multibyte character.  a patch from KIMURA Koichi
-	  <kimura.koichi at canon.co.jp>.  [ruby-dev:28598]
-
-Fri Apr 21 15:19:13 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c (lib_eventloop_ensure): refer freed pointer
-	  [ruby-core:07744] and memory leak.
-
-Fri Apr 21 12:14:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c: document update patch from Sam Roberts
-	  <sroberts at uniserve.com>.  [ruby-core:07701]
-
-Wed Apr 19 13:55:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (arg): too much NEW_LIST()
-
-	* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
-
-Wed Apr 19 11:57:04 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
-	  [ruby-dev:28585]
-
-	* parse.y (list_concat): revert last change.
-
-	* parse.y (arg): use NODE_ARGSCAT for placeholder.
-
-Wed Apr 19 11:13:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
-	  mathew <meta at pobox.com>.  [ruby-core:07738]
-
-Wed Apr 19 10:13:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_const_set): raise error when no target klass is
-	  supplied.  [ruby-dev:28582]
-
-Wed Apr 19 09:49:36 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (list_concat): should not modify nodes other than
-	  NODE_ARRAY.  [ruby-dev:28583]
-
-Tue Apr 18 17:40:37 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: add a binding to a container for a slave IP.
-
-	* ext/tk/lib/tk.rb: update RELEASE_DATE.
-
-	* ext/tk/tcltklib.c: forget to reset a Tcl interpreter.
-
-	* ext/tk/stubs.c: fix potential bugs about handling rb_argv0.
-
-Tue Apr 18 00:11:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c: block_unique should be 1, not frame_unique.
-	  [ruby-dev:28577]
-
-Fri Aug 11 15:39:25 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_body): Make RDoc
-	  ignore C function prototypes.  Patch by Tilman Sauerbeck
-	  <tilman at code-monkey.de>.  [ruby-core:8574]
-	* lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
-	  documented.
-
-Mon Apr 10 01:03:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* prec.c (prec_prec_f): documentation patch from
-	  <gerardo.santana at gmail.com>.  [ruby-core:07689]
-
-Sat Apr  8 02:34:34 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_pow): second operand may be too big even if
-	  it's a Fixnum.  [ruby-talk:187984]
-
-Sat Apr  8 02:12:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* README.EXT: update symbol description.  [ruby-talk:188104]
-
-Thu Apr  6 23:28:47 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* COPYING: explicitly note GPLv2.  [ruby-talk:187922]
-
-Thu Apr  6 11:18:37 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/panedwindow.rb: lack of arguments. [ruby-core:7681]
-
-Thu Apr  6 01:04:47 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c: fix SEGV when embedding to an application.
-	  [ruby-core:7600]
-
-	* ext/tk/tcltklib.c: fix SEGV at exit. [ruby-talk:186489]
-
-	* ext/tk/tkutil/tkutil.c: follow to changing specification of
-	  instance_eval on ruby-1.9.x.
-
-	* ext/tk/lib/tk.rb: ditto.
-
-	* ext/tk/lib/multi-tk.rb: ditto.
-
-	* ext/tk/lib/tk.rb: remove warning about redefinition of methods.
-
-	* ext/tk/lib/tk/variable.rb: remove warning about unseting Tcl
-	  variables.
-
-Wed Mar 29 20:54:44 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (fole_getproperty): WIN32OLE#[] should accept
-	  multi arguments.
-
-	* ext/win32ole/tests/testWIN32OLE.rb (test_setproperty_bracket): ditto.
-
-Wed Mar 29 10:07:44 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c (nkf_each_char_to_hex, encode_fallback_subchar,
-	  e2w_conv): support C90 compiler.
-
-Wed Mar 29 06:48:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (backtrace): reports aliased method names in a generated
-	  backtrace.  a patch from "U.Nakamura" <usa at garbagecollect.jp>.
-	  [ruby-dev:28471]
-
-Mon Mar 27 22:19:09 2006  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/{nkf.c, utf8tbl.c, config.h}: imported nkf 2.0.6.
-	  * Add --ic / --oc option and mapping tables.
-	  * Add fallback option.
-	  * Add --no-best-fit-chars option.
-	  * Fix some bugs.
-
-	* ext/nkf/nkf.c (nkf_split_options): added for parse option string.
-
-	* ext/nkf/lib/kconv.rb (Kconv.to*): add -m0.
-	  Note that Kconv.to* still imply -X.
-
-Mon Mar 27 03:17:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call0): insecure calling should be checked for non
-	  NODE_SCOPE method invocations too.
-
-	* eval.c (rb_alias): should preserve the current safe level as
-	  well as method definition.
-
-Fri Mar 24 23:14:30 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (yield_under_i): pass self again for instance_eval().
-	  [ruby-dev:28466]
-
-Fri Mar 24 17:20:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (rb_f_sleep): remove description about SIGALRM which
-	  is not valid on the current implementation.  [ruby-dev:28464]
-
-Thu Mar 23 10:47:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (method_missing): should support argument splat in
-	  super.  [ruby-talk:185438]
-
-Mon Mar 20 12:05:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* configure.in: Solaris SunPro compiler -rapth patch from
-	  <kuwa at labs.fujitsu.com>.  [ruby-dev:28443]
-
-Mon Mar 20 09:40:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* configure.in: remove enable_rpath=no for Solaris.
-	  [ruby-dev:28440]
-
-Fri Mar 17 19:08:49 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ssl.c, ext/openssl/ossl_nsspki.c: fix typo.
-	  [ruby-core:07571]
-
-Wed Mar 15 16:54:21 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): support libraries without *.so.
-
-Wed Mar 15 16:35:43 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ssl.c, ext/openssl/ossl_nsspki.c: should use
-	  "rb_str_new(0, 0)" to make empty string.
-
-Sat Mar 11 14:24:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::wrap): removed
-	  space before argument parenthesis.  [ruby-talk:183630]
-
-	* ruby.1: a clarification patch from David Lutterkort
-	  <dlutter at redhat.com>.  [ruby-core:7508]
-
-Sat Mar  4 15:26:40 2006  Tanaka Akira  <akr@m17n.org>
-
-	* gc.c (id2ref): fix symbol test.
-
-Sat Mar  4 01:08:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
-	  directories.  a patch from Eric Hodel <drbrain at segment7.net>.
-	  [ruby-core:07423]
-
-Thu Mar  2 19:44:18 2006  Tanaka Akira  <akr@m17n.org>
-
-	* gc.c: align VALUE with sizeof(RVALUE) globally.
-	  (is_pointer_to_heap): check alignment out of loop.
-	  (id2ref): avoid collision between symbols and objects.
-	  (rb_obj_id): ditto.  moved from object.c.
-	  [ruby-talk:178364] [ruby-core:7305]
-
-Thu Mar  2 18:58:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_fd_writable): should not re-schedule output
-	  from KILLED thread (must be error printing).
-
-Thu Mar  2 17:57:49 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* gc.c: commited magic for reducing RVALUE size on windows. (24->20byte)
-	  [ruby-core:7474]
-
-Thu Mar  2 12:59:14 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.c (filetime_to_unixtime): should set tm_isdst to -1.
-	  stat() didn't treat daylight saving time property on WinNT.
-	  [ruby-talk:182100]
-
-Thu Mar  2 08:02:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (add_heap): heap_slots may overflow.  a patch from Stefan
-	  Weil <weil at mail.berlios.de>.
-
-Wed Mar  1 00:24:31 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/rdoc/parsers/parse_rb.rb (read_escape): could not handle /\^/.
-	  merged Mr. Ishizuka's lib/irb/ruby-lex.rb 's patch rev 1.29.
-	  [ruby-talk:181631] [ruby-dev:28404]
-
-Tue Feb 28 09:32:17 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/drb/extservm.rb (invoke_service_command): cannot invoke command
-	  if command name is quoted on mswin32. [ruby-dev:28400]
-
-Mon Feb 27 00:19:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.h (SYM2ID): should not cast to signed long.
-	  [ruby-core:07414]
-
-Fri Feb 24 20:07:23 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* test/drb/drbtest.rb (add_service_command): quote pathnames in the
-	  server's command line for space contained directory names.
-	  Thanks, arton. [ruby-dev:28386]
-
-Fri Feb 24 12:11:08 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* instruby.rb: install *.exe.manifest and *.dll.manifest if exist.
-	  It's for VC++8.
-
-Fri Feb 24 11:33:52 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/Makefile.sub (HAVE_HYPOT): bcc32 has hypot().
-
-Fri Feb 24 11:19:58 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* time.c (time_new_internal): add prototype to tell the compiler
-	  arugments types.
-
-	* win32/win32.c (NtInitialize): need to set a handler for VC++8.
-
-Fri Feb 24 08:19:16 2006  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test.rb: Removed.  Obsolete by test/nkf.
-
-	* ext/.document: enabled documents in nkf and kconv
-
-	* ext/nkf/nkf.c ext/nkf/lib/kconv.rb: Add rdoc.
-
-Thu Feb 23 22:39:59 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/Makefile.sub: use borlndmm.dll if possible. bcc32's RTL internal
-	  memory manager cannot handle large memory block properly.
-	  ex: 10000.times { "" << "." * 529671; GC.start } # crash
-	  [ruby-dev:28230]
-
-Thu Feb 23 13:20:28 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* eval.c (SETUP_ARGS0): fixed memory corruption. [ruby-dev:28360]
-
-Tue Feb 21 02:18:46 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* configure.in (mingw): have link.  [ruby-list:41838]
-
-	* win32/Makefile.sub (config.h): ditto.
-
-Tue Feb 21 02:07:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (f_arglist): should set command_start = Qtrue for
-	  command body.  [ruby-talk:180648]
-
-Mon Feb 20 17:37:26 2006  Tanaka Akira  <akr@m17n.org>
-
-	* mkconfig.rb: alias RbConfig for Config.
-
-Mon Feb 20 12:27:53 2006  Kent Sibilev  <ksruby@gmail.com>
-
-	* lib/rational.rb (Integer::gcd): small typo fix.
-	  [ruby-core:07395]
-
-Mon Feb 20 01:05:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rational.rb (Integer::gcd): replaced by gcd4 in
-	  [ruby-core:07390].  [ruby-core:07377]
-
-Mon Feb 20 00:57:02 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl.h (OSSL_Debug): should not use __func__.
-	  [ruby-dev:28339]
-
-Sun Feb 19 04:46:29 2006  Guy Decoux  <ts@moulon.inra.fr>
-
-	* eval.c: initial value for block_unique must be 1.
-	  [ruby-talk:180420]
-
-Sat Feb 18 23:58:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/tracer.rb (Tracer::Tracer.add_filter): turn on tracer mode
-	  only when caller() level size is one.  [ruby-core:07389]
-
-	* lib/rdoc/parsers/parse_rb.rb: need not to require "tracer".
-	  [ruby-core:07389]
-
-	* sample/rtags.rb: ditto.
-
-Sat Feb 18 12:18:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/fileutils.rb (FileUtils::fu_world_writable): make it
-	  private.  [ruby-core:07383]
-
-Sat Feb 18 00:22:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/tracer.rb: merged a minor clarification patch from Daniel
-	  Berger <Daniel.Berger at qwest.com>.  [ruby-core:07376]
-
-Fri Feb 17 11:18:42 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* util.c (ruby_strtod): Float("1e") should fail. [ruby-core:7330]
-
-	* pack.c (EXTEND32): unpack("l") did not work where sizeof(long) != 4.
-	  [ruby-talk:180024]
-
-	* pack.c (pack_unpack): fixed integer overflow on template "w".
-	  [ruby-talk:180126]
-
-Fri Feb 17 09:39:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_wait_for): sleep should always sleep for
-	  specified amount of time.  [ruby-talk:180067]
-
-Thu Feb 16 01:10:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (backtrace): frame->orig_func may not be initialized.
-	  [ruby-core:07367]
-
-Wed Feb 15 16:52:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): NODE_OP_ASGN1 should allow splat in its
-	  argument list.  [ruby-core:07366]
-
-	* parse.y (arg): avoid unnecessary extra argument.
-	  [ruby-core:07366]
-
-	* eval.c (rb_eval): honor visibility on OP_ASGN1 and
-	  OP_ASGN2. [ruby-core:07366]
-
-Wed Feb 15 10:09:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (yield_under_i): should not pass self as an argument to
-	  the block for instance_eval.  [ruby-core:07364]
-
-Wed Feb 15 09:20:35 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_obj_instance_eval): should be no singleton classes for
-	  true, false, and nil.  [ruby-dev:28186]
-
-Tue Feb 14 18:48:33 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (DMETHOD_P): accessing wrong frame.  [ruby-dev:28181]
-
-	* eval.c (proc_invoke): preserve FRAME_DMETH flag.
-
-Tue Feb 14 15:13:51 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/zlib/zlib.c: supress warning on test/zlib. [ruby-dev:28323]
-
-Tue Feb 14 14:01:17 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* time.c (search_time_t): support non 32bit time_t environments.
-
-	* win32/Makefile.sub (config.h): VC++8 has ``long long'' type.
-
-	* win32/Makefile.sub (config.h): VC++8's time_t is 64bit value.
-
-	* win32/win32.c (rb_w32_utime): drop read-only attribute before
-	  changing file time.
-
-	  all changes are backported from CVS HEAD.
-
-Tue Feb 14 11:21:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (argf_forward): should not use frame->argv.
-	  [ruby-core:07358]
-
-Mon Feb 13 18:08:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call0): argument update propagation.  [ruby-dev:28044]
-
-	* env.h: remove argv member from struct FRAME.
-
-Mon Feb 13 13:27:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (eval): should push class from binding if supplied.
-	  [ruby-core:07347]
-
-Mon Feb 13 00:04:00 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/erb.rb (ERB::Compiler): add instance variable @insert_cmd to
-	  change <%='s behavior. (backported 1.15 - 1.16)
-
-Sat Feb 11 02:04:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (eval): no need to push ruby_class.  [ruby-dev:28176]
-
-Sat Feb 11 01:57:44 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_autoload): check if ruby_cbase is nil (during
-	  instance_eval for objects cannot have singleton classes,
-	  e.g. fixnums and symbols).  [ruby-dev:28178]
-
-Tue Feb  7 23:03:24 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/zlib/zlib.c: should not access ruby objects in finalizer.
-	  [ruby-dev:28286]
-
-Mon Feb  6 16:02:51 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* file.c (rb_thread_flock): ERROR_NOT_LOCKED is not an error on Cygwin.
-	  In such situation, flock() should return 0.
-
-Mon Feb  6 00:41:08 2006  Tanaka Akira  <akr@m17n.org>
-
-	* ruby.h (RSTRUCT_LEN, RSTRUCT_PTR): defined for source level
-	  compatibility with ruby 1.9.
-
-Sun Feb  5 21:05:34 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* numeric.c (fix_to_s): removed workaround for radix 2. Historically,
-	  rb_fix2str could only handle radix 8, 10, 16. (Rev1.37) But for now,
-	  it can handle radix 2..36. [ruby-Bugs#3438] [ruby-core:7300]
-
-Sun Feb  5 18:55:08 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: imported from trunk, rev 1.129
-
-	* lib/net/http.rb (add_field, get_fields): keep 1.8.2 backward
-	  compatibility.
-
-	* lib/net/https.rb: imported from trunk, rev 1.3.
-
-	* lib/net/https.rb: #use_ssl? definition moved from net/http.rb.
-
-Sun Feb  5 14:22:15 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/pstore.rb: should return default value if name is not found.
-	  [ruby-core:7304]
-
-	* lib/pstore.rb: should raise PStore::Error if not in transaction.
-
-Sat Feb  4 22:51:43 2006  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c: apply the FreeBSD getcontext/setcontext workaround
-	  only before FreeBSD 7-CURRENT.
-
-Sat Feb  4 21:19:23 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (LK_ERR): ERROR_NOT_LOCKED is not an error.
-	  In such situation, flock() should return 0.
-
-Sat Feb  4 15:56:37 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* numeric.c (fix_to_s): (2**32).to_s(2) fails with exception where
-	  sizeof(int) == 4 < sizeof(long). [ruby-core:7300]
-
-Fri Feb  3 15:06:50 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/syck/syck.c (syck_move_tokens): should reset p->cursor or etc
-	  even if skip == 0. This causes buffer overrun.
-	  (ex: YAML.load('--- "..' + '\x82\xA0' * 511 + '"'))
-
-Thu Feb  2 23:51:18 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/syck/emitter.c (syck_emitter_write): should not set '\0' on
-	  emitter's marker. if marker points to the end of buffer, this causes
-	  buffer overrun. (ex: YAML.dump("." * 12288))
-
-Thu Feb  2 16:01:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (eval): need not to protect $SAFE value.
-	  [ruby-core:07177]
-
-Thu Feb  2 14:45:53 2006  Ville Mattila  <ville.mattila@stonesoft.com>
-
-	* configure.in: The isinf is not regognized by autoconf
-	  library guesser on solaris 10. [ruby-core:7138]
-
-Wed Feb  1 22:01:47 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* configure.in, hash.c (ruby_setenv): use setenv(3) and unsetenv(3)
-	  where they are supported. modifing environ variable seems to
-	  segfault solaris 10. [ruby-core:7276] [ruby-dev:28270]
-
-	* ruby.c (set_arg0): if use setenv(3), environ space cannot be used
-	  for altering argv[0].
-
-Tue Jan 31 14:46:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* struct.c (rb_struct_select): update RDoc description.
-	  [ruby-core:7254]
-
-Tue Jan 31 11:58:51 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: add MultiTkIp#eval and bg_eval.
-
-	* ext/tk/lib/tk/namespace.rb: TkNamespace#eval was enbugged at the
-	  last commit. Now it will return a proper object.
-
-Tue Jan 31 00:10:26 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/syck/rubyext.c (syck_resolver_transfer): workaround for SEGV.
-	  ex: ruby -ryaml -e 'YAML.load("!map:B {}")' [ruby-core:7217]
-
-Sat Jan 28 07:56:57 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/rdoc/usage.rb: support "a:0:33" style caller[-1]. In this case
-	  file name is "a:0". I don't know this really happens though...
-	  [ruby-Bugs:3344]
-
-Wed Jan 25 22:29:04 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in, dln.c, file.c, intern.h, missing.h (eaccess): use
-	  system routine if provided.  fixed: [ruby-core:07195]
-
-Sun Jan 22 23:27:13 2006  Go Noguchi  <gonoguti@yahoo.co.jp>
-
-	* lib/test/unit/autorunner.rb (process_args): ignore arguments after
-	  '--' so that test scripts can handle them.  fixed: [ruby-dev:28258]
-
-Sun Jan 22 22:09:52 2006  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (POST_GETCONTEXT): define separately from PRE_GETCONTEXT on
-	  IA64 to avoid reusing variable address.
-
-Sun Jan 22 20:03:35 2006  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (ruby_setjmp): define PRE_GETCONTEXT and POST_GETCONTEXT
-	  instead of FUNCTION_CALL_MAY_RETURN_TWICE.
-	  define PRE_GETCONTEXT to clear carry flag for workaround of
-	  FreeBSD/i386 getcontext/setcontext bug.
-	  [ruby-dev:28263]
-
-Sat Jan 21 00:36:47 2006  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): use only on SPARC and IA64
-	  before gcc 4.0.3.
-	  [ruby-dev:28247]
-
-Thu Jan 19 22:21:23 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (mv): should remove file after copying.
-	  [ruby-dev:28223]
-
-Wed Jan 18 23:37:06 2006  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): don't clobber %l7 of SPARC
-	  if enable-shared.
-	  (ruby_setjmp): call FUNCTION_CALL_MAY_RETURN_TWICE after getcontext
-	  too.
-	  reported by Pav Lucistnik and Marius Strobl.
-	  http://lists.freebsd.org/pipermail/freebsd-sparc64/2006-January/003739.html
-
-Tue Jan 17 11:32:46 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/setup.mak (MAKE): workaround for nmake 8.
-
-Tue Jan 17 11:10:21 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/{Makefile.sub,setup.mak}: invoke .bat via shell. workaround
-	  for nmake 8.
-
-Mon Jan 16 10:26:23 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/syck/emitter.c (syck_emit_seq, syck_emit_map, syck_emit_item):
-	  should output complex key mark even if map's key is empty seq/map.
-	  [ruby-core:7129]
-
-Sat Jan 14 05:37:06 2006  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (READ_DATA_PENDING, READ_DATA_PENDING_COUNT): defined
-	  for DragonFly BSD 1.4.0.
-
-Sat Jan 14 03:43:24 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* file.c (rb_file_s_chmod): avoid warning where sizeof(int) !=
-	  sizeof(void*).
-
-Fri Jan 13 19:14:56 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/rdoc/diagram.rb:
-	    - properly quote bare element attributes
-	    - terminates dangling elements (e.g. <img>, <br>, <link>, etc)
-	    - converts "CVS" to the more HTML-friendly acronym element
-	    - adds missing type attributes to style elements
-
-	  based on Paul Duncan's patch <pabs@pablotron.org> [ruby-core:7028]
-
-	* lib/rdoc/generators/html_generator.rb: ditto.
-	* lib/rdoc/generators/template/html/hefss.rb: ditto.
-	* lib/rdoc/generators/template/html/html.rb: ditto.
-	* lib/rdoc/generators/template/html/kilmer.rb: ditto.
-
-Thu Jan 12 11:53:08 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/sample/tkballoonhelp.rb: [bug fix] couldn't add to a widget
-	  which is constructed with TkComposite module.
-	  [new feature] support 'command' option which is called just before
-	  popping up the balloon help.
-
-Wed Jan 11 15:00:00 2006  Ville Mattila  <mulperi@iki.fi>
-
-	* io.c (READ_PENDING*): Support solaris 64-bit environments.
-	  Solaris defines a opaque FILE struct when compiling 64 bit
-	  binaries. This means that we dont have access to _ptr etc.
-	  members anymore. The solution by Steven Lumos is to define
-	  FILE64 that has needed members available. I've modified
-	  the origanal patch a bit so that it compiles both with gcc
-	  and now free sun studio 11 compiler and both amd64 and sparc.
-	  NOTE! We have to 64 bit solaris FILE structure time to time
-	  otherwise we'll get breakage.
-	  [ruby-core:7106]
-
-Tue Jan 10 19:42:33 2006  Tanaka Akira  <akr@m17n.org>
-
-	* gc.c (garbage_collect): mark ruby_current_node.
-	  if an exception is raised in a finalizer called written in C by
-	  rb_gc_call_finalizer_at_exit, ruby_set_current_source may use
-	  collected ruby_current_node and mark_source_filename may corrupt
-	  memory.
-
-Tue Jan 10 13:30:34 2006  akira yamada  <akira@ruby-lang.org>
-
-	* ext/syck/rubyext.c (syck_resolver_transfer): should be able to load
-	  !ruby/object:Bignum syntax 1.8.3 dumped. [ruby-core:6159]
-
-Tue Jan 10 12:47:41 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/yaml/rubytypes.rb (Fixnum): Bignum could not be loaded in
-	  ruby 1.8.3/1.8.4. [ruby-core:6115]
-
-	* lib/yaml/rubytypes.rb (Numeric): Subclass of Numeric could not
-	  be dumped properly. [ruby-core:7047]
-
-Tue Jan 10 12:00:48 2006  Aaron Schrab  <aaron @nospam@ schrab.com>
-
-	* lib/yaml/rubytypes.rb (Symbol#yaml_new): YAML loading of quoted
-	  Symbols broken. [ruby-Bugs:2535]
-
-Mon Jan  9 19:54:35 2006  arton  <artonx@yahoo.co.jp>
-
-	* ext/zlib/extconf.rb: zlib compiled DLL version 1.2.3 distributed by
-	  http://www.zlib.net/ has zdll.lib. [ruby-dev:28209]
-
-Mon Jan  9 14:17:12 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/Makefile.sub (OPTFLAGS): I have experienced trouble on y- flag,
-	  (VisualC++6) so use -O2b2xg- if  $(MSC_VER) < 1400. [ruby-core:7040]
-
-Mon Jan  9 14:17:12 2006  Kero van Gelder  <rubyforge @nospam@ kero.tmfweb.nl>
-
-	* lib/webrick/httpservlet/filehandler.rb: fixed typo. [ruby-core:7075]
-
-Sat Jan  7 15:40:07 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (singleton): get rid of segfault on syntax error.
-	  fixed: [ruby-core:07070]
-
-Fri Jan  6 10:16:20 2006  Steven Lumos  <steven@lumos.us>
-
-	* io.c (READ_DATA_PENDING): defined for 64bit Solaris on SPARC.
-	  [ruby-core:7057]
-	  (READ_DATA_PENDING_COUNT): ditto.
-	  (READ_DATA_PENDING_PTR): ditto.
-
-Sun Jan  1 17:07:59 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.c (rb_w32_seekdir): should not segfault even if passed
-	  the location which rb_w32_telldir didn't return. [ruby-core:7035]
-	  (I think HEAD implementation is better. but binary compatibility)
-
-	* test/ruby/test_dir.rb: added.
-
-Sat Dec 31 22:57:00 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_thread_save_context): should not recycle scope object used
-	  in a thread.  fixed: [ruby-dev:28177]
-
-Fri Dec 30 18:22:42 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (garbage_collect): mark objects refered from aborting threads.
-	  [ruby-dev:28190]
-
-	* win32/Makefile.sub: VC++8 support.
-
-Fri Dec 30 14:24:53 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* dir.c (glob_helper): do not use TRUE for djgpp.
-
-Fri Dec 30 04:54:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (eaccess): workaround for VC++8 runtime.
-
-	* win32/win32.c (ioinfo): VC++8 support.
-
-Thu Dec 29 23:59:37 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_gc_mark_threads): leave unmarked threads which won't wake
-	  up alone, and mark threads in the loading table.  [ruby-dev:28154]
-
-	* eval.c (rb_gc_abort_threads), gc.c (gc_sweep): kill unmarked
-	  threads.  [ruby-dev:28172]
-
-Thu Dec 29 17:02:07 2005  Tanaka Akira  <akr@m17n.org>
-
-	* test/ruby/envutil.rb (EnvUtil.rubybin): search "ruby" instead of
-	  "miniruby".  [ruby-dev:28140]
-
-Tue Dec 27 16:59:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/drb/drbtest.rb (DRbService::self.ext_service): increase
-	  timeout limit.  a patch from Kazuhiro NISHIYAMA
-	  <zn at mbf.nifty.com>. [ruby-dev:28132]
-
-Tue Dec 27 08:29:18 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_chech):
-	  treat wildcard character in commonName. [ruby-dev:28121]
-
-Mon Dec 26 22:32:47 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_eval), gc.c (gc_mark_children), node.h (NEW_ALIAS,
-	  NEW_VALIAS), parse.y (fitem): allow dynamic symbols to
-	  NODE_UNDEF and NODE_ALIAS.
-	  backported from trunk.  fixed: [ruby-dev:28105]
-
-Mon Dec 26 08:50:36 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (ev_const_get): fixed a bug in constant reference during
-	  instance_eval.  [yarv-dev:707]
-
-	* eval.c (ev_const_defined): ditto.
-
-	* lib/yaml.rb (YAML::add_domain_type): typo fixed.  a patch from
-	  Joel VanderWerf <vjoel at path.berkeley.edu>.
-	  [ruby-talk:165285] [ruby-core:6995]
-
-Sat Dec 24 18:58:14 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* stable version 1.8.4 released.
-
-Fri Dec 23 10:30:23 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/digest/sha2/sha2.c (ULL): support AIX C.  a patch from
-	  Kailden <kailden at gmail.com>.  [ruby-core:06984]
-
-Wed Dec 21 16:53:06 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* file.c (w32_io_info): should return handle because FileIndex is
-	  valid only while file is open. [ruby-dev:28088]
-
-Wed Dec 21 14:53:26 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb (test_kernel_open): use File.identical?.
-	  [ruby-talk:171804]
-
-Tue Dec 20 22:41:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (eval_under_i): evaluate source in caller's frame.
-	  [ruby-dev:28076]
-
-	* eval.c (rb_call_super): use original method name on exception.
-	  [ruby-dev:28078]
-
-Tue Dec 20 13:11:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/syck/rubyext.c: fixed GC problem (backported HEAD 1.55 - 1.62)
-	  [ruby-dev:27839]
-
-	* ext/syck/syck.h (S_FREE): small hack. no need to check if pointer is
-	  NULL or not before S_FREE.
-
-	* st.c: uses malloc instead of xmalloc to avoid GC. syck uses st_insert
-	  in gram.c to insert node from rb_syck_bad_anchor_handler into
-	  SyckParser's hash table. if GC occurs in st_insert, it's not under
-	  SyckParser's mark system yet. so RString can be released wrongly.
-	  [ruby-dev:28057]
-
-Tue Dec 20 12:53:23 2005  why the lucky stiff  <why@ruby-lang.org>
-
-	* ext/syck/rubyext.c (syck_emitter_reset): to ensure compatibility
-	  with previous Ruby versions, documents are no longer headless.
-
-Tue Dec 20 01:46:48 2005  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (rb_f_backquote): fix a GC problem on
-	  IA64 with gcc 4.0.3 20051216 (prerelease) -O3.
-
-Mon Dec 19 23:32:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_symname_p): fixed wrong validation.  [ruby-dev:28047]
-
-Sat Dec 17 03:57:01 2005  Tanaka Akira  <akr@m17n.org>
-
-	* bignum.c (rb_big_rshift): fix a GC problem on
-	  IA64 with gcc 4.0.3 20051216 (prerelease).
-
-Sat Dec 17 03:30:23 2005  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (bmcall): fix a GC problem by tail call on
-	  IA64 with gcc 4.0.3 20051216 (prerelease).
-
-Fri Dec 16 00:54:06 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* signal.c (Init_signal): revert C++ style comment.
-	  [ruby-dev:28041]
-
-Thu Dec 15 12:35:14 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/tmpdir.rb: merged RDoc patch from Eric Hodel <drbrain at
-	  segment7.net>.  [ruby-core:06894]
-
-Thu Dec 15 01:33:31 2005  Tanaka Akira  <akr@m17n.org>
-
-	* ext/zlib/zlib.c (zstream_run): fix a GC problem by tail call on
-	  x86_64 with gcc 4.0.3 20051111 (prerelease) (Debian 4.0.2-4)
-
-Wed Dec 14 12:11:46 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* test/gdbm/test_gdbm.rb: specify pid for the argument of
-	  Process.wait.  workaround for Cygwin.
-
-Wed Dec 14 12:01:26 2005  Tanaka Akira  <akr@m17n.org>
-
-	* marshal.c (r_object0): fix a GC problem for reading a bignum on
-	  IA64 with gcc 3.3.5 (Debian 1:3.3.5-13).
-
-Tue Dec 13 12:23:47 2005  Tanaka Akira  <akr@m17n.org>
-
-	* re.c (rb_reg_regcomp): fix a GC problem on x86_64 with
-	  gcc 3.3.5 (Debian 1:3.3.5-13).
-
-Tue Dec 13 01:44:16 2005  Tanaka Akira  <akr@m17n.org>
-
-	* array.c (rb_ary_diff): fix a GC problem on IA64 with
-	  gcc 3.3.5 (Debian 1:3.3.5-13).
-	  When rb_ary_push is called, there was no register which contains
-	  `hash' but `&RHASH(hash)->tbl' instead.
-
-Tue Dec 13 00:08:09 2005  Tanaka Akira  <akr@m17n.org>
-
-	* sprintf.c (rb_str_format): fix a GC problem.
-	  [ruby-dev:28001]
-
-Mon Dec 12 15:54:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* test/openssl/test_ssl.rb (test_parallel): call GC.start to close
-	  unused files. [ruby-dev:27981]
-
-Mon Dec 12 00:33:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/digest/digest.c (rb_digest_base_s_digest): add volatile to
-	  protect temporary context object.  [ruby-dev:27979]
-
-	* ext/iconv/iconv.c (Init_iconv): rb_gc_register_address() should
-	  be called before actual variable initialization.
-	  [ruby-dev:27986]
-
-Fri Dec  9 23:31:02 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rexml/encoding.rb (encoding=): give priority to particular
-	  conversion to iconv.  [ruby-core:06520]
-
-Thu Dec  8 02:07:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (umethod_bind): adjust invoking class for module method.
-	  [ruby-dev:27964]
-
-Thu Dec  8 00:40:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (call_trace_func): klass parameter should be a
-	  class/module that defines calling method.  [ruby-talk:169307]
-
-Wed Dec  7 17:10:27 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* sprintf.c (rb_f_sprintf): [ruby-dev:27967]
-
-Wed Dec  7 15:31:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): integer overflow check added.
-
-	* sprintf.c (GETASTER): ditto.
-
-Wed Dec  7 01:02:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/README.macosx-aqua: [new document] tips to avoid the known
-	  bug on platform specific dialogs of Tcl/Tk Aqua on MacOS X.
-
-	* ext/tk/tcltklib.c: fix bug on switching threads and waiting on the
-	  deleted interpreter on vwait and tkwait command.
-
-	* ext/tk/lib/multi-tk.rb: kill the meaningless loop for the deleted Tk
-	  interpreter.
-
-	* ext/tk/sample/demos-jp/image3.rb: [bug fix] wrong argument.
-
-	* ext/tk/sample/demos-en/image3.rb: ditto.
-
-	* ext/tk/sample/demos-jp/menu.rb: fix message for MacOS X.
-
-	* ext/tk/sample/demos-jp/menu8x.rb: ditto.
-
-	* ext/tk/sample/demos-en/menu.rb: ditto.
-
-Tue Dec  6 16:37:57 2005  Yuya Nishida  <yuya@j96.org>
-
-	* eval.c (exec_under): avoid accessing ruby_frame->prev.
-	  [ruby-dev:27948]
-
-Thu Dec  1 00:50:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_funcall2): allow to call protected methods.
-	  fixed: [ruby-dev:27890]
-
-Wed Nov 30 23:52:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (NEWHEAP, ADD2HEAP): set count after pointer was set.
-	  fixed: [ruby-dev:27896]
-
-Wed Nov 30 13:43:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-expr-beg): support $! at the end of
-	  expression.   [ruby-dev:27868]
-
-Mon Nov 28 18:55:43 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/socket.c (init_inetsock_internal): remove setting
-	  SO_REUSEADDR option on server socket on Cygwin.
-	  fixed: [ruby-core:6765] ([ ruby-Bugs-2872 ])
-
-Mon Nov 28 13:08:54 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.c (rb_w32_strerror): remove all CR and LF. (avoid broken
-	  error message on bccwin32 + winsock)
-
-Mon Nov 28 09:21:49 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/mkmf.rb (create_makefile): should not change sodir with
-	  dir.gsub!. (bccwin32 failed to install third party exntesions)
-	  [ruby-dev:27834]
-
-Sun Nov 27 00:56:13 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/wsdl/xmlSchema/complexContent.rb: missing
-	  ComplexContent#elementformdefault method.
-
-Sat Nov 26 19:57:45 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* dln.c (conv_to_posix_path): should initialize posix.
-
-Thu Nov 24 21:05:58 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* configure.in (AC_CHECK_FUNCS): need to check link().
-	  fixed: [ruby-dev:27814]
-
-Thu Nov 24 01:22:25 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* file.c (w32_io_info): CreateFile failed on Win9x if file was already
-	  opened. (FILE_SHARE_READ was needed, but actually I don't understand
-	  the flags of CreateFile well...)
-
-Wed Nov 23 20:59:01 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: add Tk.pkgconfig_list and Tk.pkgconfig_get
-	  [Tk8.5 feature].
-
-	* ext/tk/lib/tk/text.rb: supports new indices modifires on a Text
-	  widget [Tk8.5 feature].
-
-	* ext/tk/lib/tk/virtevent.rb: add TkNamedVirtualEvent.
-
-	* ext/tk/lib/tk/autoload.rb: ditto.
-
-	* ext/tk/lib/tk/event.rb: add :data key for virtual events [Tk8.5
-	  feature].
-
-Wed Nov 23 18:55:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* file.c (w32_io_info): should not call GetFileInformationByHandle
-	  for pipe.
-
-	* file.c (w32_io_info): checks return value from rb_w32_get_osfhandle.
-
-	* file.c (w32_io_info): now can identify directory on WinNT.
-
-Wed Nov 23 03:40:49 2005  Guy Decoux  <ts@moulon.inra.fr>
-
-	* re.c (KR_REHASH): should cast to unsigned for 64bit CPU.
-	  [ruby-core:06721]
-
-Wed Nov 23 11:01:33 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* intern.h, file.c: failed to compile on windows.
-
-Wed Nov 23 07:26:44 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: check for X509V3_EXT_nconf_nid.
-
-	* ext/openssl/ossl_x509ext.c (MakeX509ExtFactory): should use
-	  OPENSSL_malloc to allocate X509V3_CTX.
-
-	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_create_ext): use
-	  X509V3_EXT_nconf_nid to avoid SEGV (and to build extensions which
-	  values are placed in separate section).
-
-	* test/openssl/test_x509ext.rb: new file.
-
-Wed Nov 23 01:22:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (test_identical): test if two files are identical.
-
-	* file.c (rb_f_test): support DOSISH systems where st_ino is not
-	  reliable.  fixed: [ruby-core:06672]
-
-	* win32.h, win32.c (rb_w32_osid): check the running platform.
-
-Tue Nov 22 23:52:06 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb: match incomplete (in current enconding) multibyte
-	  string.  http://inamode6.tokuhirom.dnsalias.org/show/1551
-
-Tue Nov 22 18:36:11 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.c (winnt_stat): set mapped errno instead of ENOENT.
-
-Tue Nov 22 14:46:57 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (rb_file_s_basename): skip slashes just after UNC top slashes.
-
-	* test/ruby/test_path.rb (test_dirname, test_basename): follow new
-	  spec. and add new tests.
-
-Tue Nov 22 13:18:32 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.c (rb_w32_stat): Dir.chdir('//server/shared');
-	  p Dir.glob('*') should work on WinNT. (implemented our own
-	  stat(2) on WinNT) [ruby-list:41552] [ruby-dev:27711]
-
-Tue Nov 22 02:31:53 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkextlib/tile.rb: bug fix (Tk::Tile::USE_TTK_NAMESPACE
-	  is not defined).
-
-Tue Nov 22 01:45:21 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_s_basename): DOSISH_UNC is defined on cygwin but
-	  DOSISH is not.  fixed: [ruby-dev:27797]
-
-Mon Nov 21 22:50:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_path_skip_prefix, rb_file_s_basename): UNC without path
-	  should not be splitted.  fixed: [ruby-dev:27776] [ruby-dev:27786]
-
-	* parse.y (dsym): prohibit empty symbol literal by interpolation.
-	  fixed: [ruby-talk:166529]
-
-Mon Nov 21 16:03:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/setup.mk: findstr doesn't exist on win9x.
-	  fixed: [ruby-dev:27756]
-
-Sun Nov 20 22:34:06 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_symname_p): [ not followed by ] is not valid symbol.
-	  fixed: [ruby-talk:166520]
-
-Sat Nov 19 19:57:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/fileutils.rb (FileUtils::ln): ln documentation fix.
-	  [ruby-core:06661]
-
-Sat Nov 19 07:34:32 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/font.rb: remove dependency on Ruby's version (1.8
-	  or 1.9).
-
-	* ext/tk/lib/tkextlib/ICONS/icons.rb: ditto.
-
-	* ext/tk/sample/tkextlib/treectrl/demo.rb: ditto.
-
-Fri Nov 18 17:57:08 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (rb_file_s_dirname): should use skipprefix for UNC path.
-	  pointed out by nobu ([ruby-dev:27744]). fixed: [ruby-core:5076]
-
-Fri Nov 18 17:35:09 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: add restriction to access the entried
-	  command table and manipulate other IPs (for reason of security).
-	  Now, a IP object can be controlled by only its master IP or the
-	  default IP.
-
-	* ext/tk/lib/remote-tk.rb: add restriction to manipulate.
-
-	* ext/tk/tcltklib.c (ip_is_slave_of_p): add TclTkIp#slave_of?(ip)
-	  to check manipulability.
-
-	* ext/tk/lib/tk.rb: bug fix on handling of Tcl's namespaces.
-
-	* ext/tk/lib/tk/namespace.rb: ditto.
-
-Fri Nov 18 17:26:06 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (rb_file_s_dirname): added checks for some patterns with drive
-	  letter. fixed: [ruby-dev:27738]
-
-	* test/ruby/test_path.rb (test_dirname): added tests for above
-	  patterns.
-
-Fri Nov 18 12:18:02 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.h (S_IFIFO): r,w = IO.pipe; r.stat.pipe? now
-	  returns true on VisualC++6.
-
-Wed Nov 16 23:24:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (static-ruby): overridable.
-
-	* ext/extmk.rb (parse_args): force to link extensions statically only
-	  if static is given for extstatic.
-
-	* ext/extmk.rb (RUBY, RUBYW): overridable.
-
-Tue Nov 15 23:46:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/find.rb (Find::find): should not ignore symbolic links to
-	  non-existing files.  [ruby-talk:165866]
-
-Tue Nov 15 16:23:26 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* array.c (rb_ary_fill): previous commit disabled this usage:
-
-	    a = [0,1,2,3,4,5,6,7,8,9]
-	    a.fill {|i| a[i] * 10} #=> [nil, nil, ...., nil]
-
-	  previous commit has the advantage of early garbage collection, but
-	  potensially this would break some script. so I reverted behavior.
-
-Tue Nov 15 16:04:10 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* array.c (rb_ary_fill): tail elements were vanished when the middle
-	  part of array was filled. (ie: [0,1,2,3,4].fill(-1,2,1) => [0,1,-1])
-
-	* test/ruby/test_array.rb (test_fill): added.
-
-Tue Nov 15 14:39:16 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_fill): should adjust array length correctly when
-	  an array is expanded in the fill process.  [ruby-core:06625]
-
-Mon Nov 14 23:49:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_s_readlink): ERANGE will occur only on GPFS.
-	  [ruby-dev:27699]
-
-Mon Nov 14 17:36:22 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_first): RDoc update from Daniel Berger
-	  <djberg96@yahoo.com>.  [ruby-core:06577].
-
-Fri Nov 11 10:31:44 2005  Zach Dennis  <zdennis@mktec.com>
-
-	* ext/socket/socket.c: Socket Documentation. [ruby-core:6552]
-
-Fri Nov 11 08:20:56 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (OUTFLAG): keep trailing spaces.  [ruby-dev:27666]
-
-	* mkconfig.rb: substitution refereces added.
-
-Fri Nov 11 07:44:18 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* configure.in: undef HAVE_LINK on BeOS. (link(2) always returns
-	  EINVAL, and this causes error in test/fileutils.)
-
-	* file.c: overwride chown(2) and fchown(2) on BeOS. (these functions
-	  should not change user/group id if -1 is passed as corresponding
-	  argument, and this causes error in test/fileutils too)
-	  [ruby-dev:27672]
-
-	* file.c (rb_file_s_link): checks HAVE_LINK.
-
-Tue Nov  8 15:32:27 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/drb/ssl.rb (DRb::SSLConfig#accept): fixed typo.
-	  [ruby-dev:27560] [ruby-core:4627]
-
-Mon Nov  7 13:43:51 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/stubs.c (_nativethread_consistency_check): use simpler
-	  (low cost) way to check whether the Tcl interpreter was compiled
-	  with threads enabled of not.
-
-	* ext/tk/tcltklib.c: reduce warnings.
-
-	* ext/tk/tkutil/tkutil.c: ditto.
-
-Mon Nov  7 00:06:58 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/yaml.rb: removed :nodoc: to generate Kernel doc. [ruby-core:6324]
-
-Sun Nov  6 23:39:13 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (Iconv::BrokenLibrary): exception when detected a
-	  bug of underlying library.
-
-Sun Nov  6 21:46:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/tk/stubs.c (ruby_tcl_create_ip_and_stubs_init): should touch
-	  interpreter after initialization is done. [ruby-dev:27638]
-
-Sun Nov  6 20:13:27 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_s_readlink): readlink(2) on AIX fails with ERANGE if
-	  buffer size is less than required.  fixed: [ruby-dev:27634]
-
-Wed Nov  2 20:25:28 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/extconf.rb: ext/tk/extconf.rb: change the check parameter
-	  for Win32.
-
-Wed Nov  2 20:14:53 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib: merge into ext/tk and remove.
-
-Wed Nov  2 19:03:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c (ip_rbUpdateObjCmd,
-	  ip_rb_threadUpdateObjCmd): passed improper flags to DoOneEvent().
-
-	* ext/tk/tkutil.c: use rb_obj_respond_to() instead of rb_respond_to().
-
-Tue Nov  1 14:20:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call_super): should call method_missing if super is
-	  called from Kernel method.
-
-	* eval.c (exec_under): frame during eval should preserve external
-	  information.
-
-Tue Nov  1 10:50:17 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: should check ERR_peek_last_error().
-	  [ruby-dev:27597]
-
-	* ext/openssl/ossl.c (ossl_raise): ditto.
-
-Mon Oct 31 17:34:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* configure.in: use proper option for Sun linker. A patch from
-	  Shinya Kuwamura <kuwa at labs.fujitsu.com>.  [ruby-dev:27603]
-
-Mon Oct 31 11:27:22 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/gdbm/test_gdbm.rb, test/sdbm/test_sdbm.rb (test_s_open_error):
-	  skip on Win32/DOS platforms.
-
-Mon Oct 31 05:49:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_update): input data must
-	  not be empty. [ruby-talk:161220]
-
-	* test/openssl/test_cipher.rb: add test for Cipher#update("").
-
-Mon Oct 31 05:37:20 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpservlet/cgihandler.rb
-	  (WEBrick::HTTPServlet::CGIHandler#do_GET): the value of Set-Cookie:
-	  header field should be splited into each cookie.  [ruby-Bugs:2199]
-
-	* lib/webrick/cookie.rb (WEBrick::Cookie.parse_set_cookie): new method
-	  to parse the value of Set-Cookie: header field.
-
-	* test/webrick/test_cookie.rb, test/webrick/test_cgi.rb,
-	  test/webrick/webrick.cgi: add some test for cookie.
-
-Mon Oct 31 03:19:36 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/readline/readline.c (readline_readline): type check.
-	  [ruby-core:6089]
-
-	* numeric.c (fix_rshift): RDoc fix.  [ruby-core:6351]
-
-	* util.h (strtod): add #undef for platforms defines strtod()
-	  macro.   [ruby-dev:27563]
-
-Mon Oct 31 02:35:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* test/ruby/test_float.rb (test_precision): test by assert_in_delta.
-	  [ruby-dev:27575]
-
-Sat Oct 29 01:58:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/etc/etc.c: document update from mathew <meta@pobox.com>.
-	  [ruby-core:06473]
-
-	* ext/fcntl/fcntl.c: ditto.
-
-Thu Oct 27 16:45:31 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (scan_once): wrong condition to use mbclen2().
-	  [ruby-dev:27535]
-
-Wed Oct 26 09:27:27 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/syck/implicit.c (syck_type_id_to_uri): should return
-	  newly allocated memory. otherwise, type_id will be freed
-	  twice. [ruby-dev:27384] [ruby-core:6385]
-
-Wed Oct 26 09:04:51 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ruby.h (Qfalse, Qtrue, Qnil, Qundef): make sure these immediate
-	  values have VALUE type. there is an environment where sizeof(VALUE)
-	  != sizeof(int) like IA64. if 32bit integer (Qtrue) is passed to ANYARGS
-	  and received by 64bit integer (VALUE), upper bits may have garbage value.
-	  [ruby-dev:27513]
-
-Wed Oct 26 01:58:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_EXTERN): macro to export symbols in shared
-	  library.  [ruby-core:05528]
-
-	* defines.h, {bcc32,win32,wince}/Makefile.sub (RUBY_EXTERN): moved to
-	  configuration pass.
-
-	* ext/extmk.rb (extmake): RUBY_EXTERN for static linked extensions.
-
-Tue Oct 25 15:32:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rational.rb: applied documentation patch from Gavin Sinclair
-	  <gsinclair@gmail.com>.  [ruby-core:06364]
-
-	* lib/irb.rb (IRB::Irb::eval_input): handle prompts with newlines
-	  in irb auto-indentation mode.  [ruby-core:06358]
-
-Tue Oct 25 02:12:08 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::LABEL_LIST_RE):
-	  reduce redundant backtrack.  [ruby-talk:161771]
-
-Tue Oct 25 00:27:35 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/*: RDoc documentation from Eric Hodel
-	  <drbrain@segment7.net> added.
-
-Mon Oct 24 21:14:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in, io.c: use sys/syscall.h if syscall.h is not available.
-	  [ruby-core:06247]
-
-Mon Oct 24 20:49:45 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/Win32API/lib/win32/resolv.rb (get_info): support multiple DNS.
-	  fixed: [ruby-list:40058], [ruby-dev:27479]
-
-Mon Oct 24 07:57:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys):
-	  typo fixed.  [ruby-talk:162187]
-
-	* ext/tk/lib/tk/menu.rb (TkMenuEntryConfig::__item_val2ruby_optkeys):
-	  ditto.  [ruby-core:06359]
-
-Sun Oct 23 21:50:15 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/enumerator/enumerator.c: applied documentation patch from
-	  James Edward Gray II <james@grayproductions.net>.
-	  [ruby-core:06348]
-
-Sun Oct 23 07:11:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/extconf.rb: improve messages [ruby-core:06325].
-
-	* ext/tk/lib/tk.rb, ext/tk/lib/tk/canvas.rb, ext/tk/lib/tk/entry.rb,
-	  ext/tk/lib/tk/frame.rb, ext/tk/lib/tk/image.rb,
-	  ext/tk/lib/tk/itemconfig.rb, ext/tk/lib/tk/labelframe.rb,
-	  ext/tk/lib/tk/listbox.rb, ext/tk/lib/tk/menu.rb,
-	  ext/tk/lib/tk/radiobutton.rb, ext/tk/lib/tk/scale.rb,
-	  ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tk/text.rb,
-	  ext/tk/lib/tk/toplevel.rb: improve conversion of option values.
-
-	* ext/tk/lib/tkextlib/*: ditto.
-
-	* ext/tk/lib/tkextlib/*: update to support ActiveTcl8.4.11.2.
-
-	* ext/tk/lib/tkextlib/trofs/*: support Trofs 0.4.3.
-
-	* ext/tk/lib/tkextlib/tile/*: support Tile 0.7.2.
-
-	* ext/tk/lib/tkextlib/vu/*: support vu 2.3.0.
-
-	* ext/tk/lib/tkextlib/tcllib/*: support Tcllib 1.8 (Tklib 0.3).
-
-Sat Oct 22 23:54:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb, lib/mkmf.rb (with_config): support --with-extension
-	  options.  [ruby-dev:27449]
-
-Sat Oct 22 13:26:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (sym_inspect), parse.y (parser_yylex, rb_symname_p): check
-	  if valid as a symbol name more strictly.  [ruby-dev:27478]
-
-	* test/ruby/test_symbol.rb: tests for [ruby-core:03573].
-
-	* time.c (rb_strftime): removed meaningless volatile modifiers, and
-	  concatenate successive nul characters at once.  [ruby-dev:27472]
-
-Fri Oct 21 19:21:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* rubysig.h (CHECK_INTS): fixed typo. (I believe bit-or is improper)
-
-Fri Oct 21 17:49:32 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bin/erb (ERB::Main::run): typo fixed.  [ruby-core:06337]
-
-Fri Oct 21 15:27:17 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bignum.c (bignew_1): convertion from `int' to `char' discards
-	  upper bits, (ie. (char)0xff00 -> 0) so it's better to test if
-	  nonzero and set 0 or 1 instead of simply casting ... as a flag usage.
-	  (but I believe this won't cause actual bug in current implementation)
-	  [ruby-dev:27055]
-
-	* time.c: should use LONG_LONG instead of `long long'.
-
-Thu Oct 20 09:37:15 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/mkmf.rb (create_makefile): Borland make seems not to allow
-	  empty dependency list. If this change is not good, please correct
-	  it.
-
-Thu Oct 20 07:55:09 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): get rid of a restriction
-	  of Borland make.  fixed: [ruby-dev:27460]
-
-Thu Oct 20 00:13:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* rubysig.h (CHECK_INTS): fix typo.
-
-Wed Oct 19 23:58:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): do not create unnecessary empty
-	  directories.  fixed: [ruby-dev:27451]
-
-Wed Oct 19 19:26:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_gc_mark_parser): get rid of segfault with old yacc.
-	  fixed: [ruby-dev:27439]
-
-Wed Oct 19 08:28:32 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_join): elements may contain null pointer strings.
-	  report and fixed by Lloyd Zusman (hippoman): [ruby-core:06326]
-
-Wed Oct 19 02:34:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c, gc.c, time.c: made internal symbols static.  [ruby-dev:27435]
-
-Wed Oct 19 01:27:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* regex.c (re_compile_pattern): numeric literal inside character class
-	  disabled succeeding backtrack.  fixed: [ruby-list:41328]
-
-Mon Oct 17 21:18:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_heap): byacc never free parser stack.
-	  fixed: [ruby-dev:27428]
-
-Mon Oct 17 16:04:47 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (chmod_internal, lchmod_internal): fixed type of 2nd argument.
-
-Sun Oct 16 22:16:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: omit non-existing directories.
-
-Sun Oct 16 14:30:05 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/rinda.rb (Rinda::Tuple#initialize): check remote hash
-	  tuple. fixed: [ruby-list:41227]
-
-	* test/rinda/test_rinda.rb: test it.
-
-Sun Oct 16 03:38:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* rubysig.h (CHECK_INTS): prevent signal handler to run during
-	  critical section.  [ruby-core:04039]
-
-	* eval.c (load_wait): need not to call rb_thread_schedule()
-	  explicitly.  [ruby-core:04039]
-
-	* eval.c (rb_thread_schedule): clear rb_thread_critical.
-	  [ruby-core:04039]
-
-Sat Oct 15 19:56:38 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* bin/erb: typo fixed, again. thanks, Doug Kearns.
-
-Fri Oct 14 22:08:26 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (ioctl): should set errno.
-
-Fri Oct 14 16:57:32 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/config.rb (Config::FileHandler): :UserDir should be nil.
-	  It is harmful to permit the access to ~/public_html by default.
-	  suggested by Hiroyuki Iwatsuki.
-
-Thu Oct 13 23:29:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (HEAPCNT): bison allocates indivisible size.
-	  fixed: [ruby-core:06261]
-
-	* io.c, pack.c, ext/syck/rubyext.c, ext/syck/syck.h, missing/isinf.c:
-	  get rid of warnings.  fixed: [ruby-core:06247]
-
-Wed Oct 12 12:52:57 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl.c (Init_openssl): should call
-	  OpenSSL_add_ssl_algorithms().
-
-Wed Oct 12 11:08:54 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* file.c (rb_f_test): typo in RDoc comments.
-
-Tue Oct 11 21:41:58 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_obj_respond_to): check if obj responds to the given
-	  method with the given visibility.  [ruby-dev:27408]
-
-	* eval.c (rb_respond_to): conform to Object#respond_to?.  [ruby-dev:27411]
-
-Tue Oct 11 00:01:21 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* st.c (st_free_table): do not call free() but xfree().
-	  [ruby-core:06205]
-
-Sat Oct  8 20:04:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (Init_Binding): add Binding#dup method.  [yarv-dev:666]
-
-	* parse.y (rb_parser_malloc, rb_parser_free): manage parser stack on
-	  heap.  [ruby-list:41199]
-
-	* ext/iconv/charset_alias.rb: parse config.charset_alias file directly.
-
-Fri Oct  7 09:54:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::Cookie::parse): Cookies from Nokia devices may
-	  not be parsed correctly.  A patch from August Z. Flatby
-	  (augustzf) in [ruby-Patches-2595].  [ruby-core:06183]
-
-Thu Oct  6 20:12:16 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/strscan/strscan.c (strscan_free): remove useless code.
-	  [ruby-dev:26368] [ruby-dev:27389]
-	  (backported from trunk, rev 1.22)
-
-Wed Oct  5 04:42:38 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/xmlrpc/server.rb (XMLRPC::Server#initialize): should mount the
-	  servlet on "/".
-
-Wed Oct  5 03:59:09 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/xmlrpc/server.rb (XMLRPC::Server#serve): delete wrong call
-	  of "join".
-
-Mon Oct  3 00:04:00 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* pack.c (EXTEND16): [ruby-dev:27383]
-
-Thu Sep 29 10:26:18 2005  Tanaka Akira  <akr@m17n.org>
-
-	* ext/dl/dl.c (rb_io_to_ptr): abolish sizeof(FILE).
-	  [ruby-dev:27317]
-
-Thu Sep 29 07:22:05 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* evalc. (rb_f_send): underscores need to be escaped.
-	  fixed by Doug Kearns.  [ruby-core:06053]
-
-Thu Sep 29 00:57:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (ev_const_get), variable.c (rb_const_get_0): retry only when
-	  autoload succeeded.
-
-	* variable.c (rb_autoload_load): now return true if autoload
-	  succeeded.  fixed: [ruby-dev:27331]
-
-Wed Sep 28 23:42:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (apply2files): add prototype.
-
-	* file.c (rb_stat_inspect): constified.
-
-	* class.c (rb_mod_init_copy, rb_class_init_copy), file.c (rb_stat_init_copy),
-	  numeric.c (num_init_copy), object.c (rb_obj_init_copy, Init_Object),
-	  re.c (match_init_copy, rb_reg_init_copy), time.c (time_init_copy):
-	  undocumented.
-
-Wed Sep 28 23:09:23 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/delegate.rb: document update from James Edward Gray II
-	  <james@grayproductions.net>.  [ruby-core:06027]
-
-Wed Sep 28 15:14:19 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/cgi.rb (WEBrick::CGI#start): req.query_string should
-	  refer the value of QUERY_STRING. [ruby-list:41186]
-
-	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#query_string=):
-	  add new method.
-
-Wed Sep 28 10:45:44 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: cannot compile with Tcl/Tk8.0.x
-	  [ruby-dev:27335].
-
-Wed Sep 28 08:12:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (read_buffered_data): check if reached EOF.  fixed: [ruby-dev:27334]
-
-Wed Sep 28 07:56:52 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/yaml/basenode.rb (YAML::BaseNode::match_segment): fix typo.
-	  [ruby-dev:27237], [ruby-core:05854]
-
-	* lib/yaml/tag.rb (Module#yaml_as): suppress warnings.
-
-	* lib/yaml/types.rb (YAML::PrivateType, YAML::DomainType): ditto.
-
-Wed Sep 28 03:23:35 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* rubysig.h: fixed build problem with --enable-pthread on platforms
-	  which don't have setitimer().
-
-Mon Sep 26 22:32:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (set_trace_func): add rb_secure(4) to prevent adding
-	  tracing function.
-
-Sun Sep 25 12:05:10 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* bin/erb: typo fixed.
-
-Sun Sep 25 01:46:43 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-calculate-indent): arrange deep-indent
-	  closing parenthesis at same column as the opening.
-
-Sun Sep 25 00:42:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-expr-beg): deal with heredoc separately.
-	  fixed: [ruby-list:41168]
-
-	* misc/ruby-mode.el (ruby-calculate-indent): not to deepen indent
-	  level for continuous line inside parentheses.
-	  http://nabeken.tdiary.net/20050915.html#p02
-
-Sun Sep 25 00:18:11 2005  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (unknown_node): show more information.  [ruby-dev:26196]
-
-Sat Sep 24 08:56:01 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (cd): no longer accept :noop option, related
-	  code is useless (backported from trunk, rev 1.67).
-	  [ruby-core:05858] [ruby-Bugs:2494]
-
-Sat Sep 24 08:38:07 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb: fix visibility of FileUtils::NoWrite, Verbose,
-	  DryRun (backported from trunk, rev 1.66). [ruby-core:05954]
-
-	* test/fileutils/test_nowrite.rb: test it.
-
-	* test/fileutils/test_dryrun.rb: new file.
-
-	* test/fileutils/test_verbose.rb: new file.
-
-Sat Sep 24 02:40:20 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/delegate.rb: document update from James Edward Gray II
-	  <james@grayproductions.net>.  [ruby-core:05942]
-
-Thu Sep 22 23:36:24 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (find_executable0): default path if environment is not
-	  set.  [ruby-dev:27281]
-
-Thu Sep 22 16:33:12 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* test/readline/test_readline.rb (TestReadline::replace_stdio):
-	  merged the patch of [ruby-dev:25232] instead of [ruby-dev:25223].
-
-Wed Sep 21 23:30:44 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (configuration): generalized nmake dependent code.
-
-Wed Sep 21 09:07:55 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* stable version 1.8.3 released.
-
-Wed Sep 21 08:52:25 2005  why the lucky stiff  <why@ruby-lang.org>
-
-	* ext/syck/token.c: correctly compute identation of a block
-	  scalar's parent node. [ruby-talk:150620]
-
-Wed Sep 21 08:20:24 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* README.EXT, README.EXT.ja: add new features.
-
-Wed Sep 21 07:43:58 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (default_argv, Arguable#options): defaults strings
-	  to be parsed to Arguable instance.
-
-Wed Sep 21 02:44:09 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (path_check_0): disallow sticky world writable directory
-	  in PATH (and $LOAD_PATH).  [ruby-dev:27226]
-
-	* file.c (fpath_check): typo fixed.
-
-Tue Sep 20 22:29:49 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/wsdl/simpletype/rpc/test_rpc.rb, test/wsdl/ref/test_ref.rb,
-	  test/wsdl/any/test_any.rb test/soap/wsdlDriver/test_calc.rb:
-	  suppress deliberate warnings with $VERBOSE = nil.
-
-Tue Sep 20 21:26:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/wait/lib/nonblock.rb: disable on platforms non-blocking flag
-	  is not available.  fixed: [ruby-dev:27187]
-
-Tue Sep 20 18:23:04 2005  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (thread_mark): mark th->last_status.  [ruby-dev:27179]
-
-Tue Sep 20 18:20:33 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/yaml.rb: require 'yaml/constants'.  [ruby-core:5776]
-
-Tue Sep 20 17:48:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/xmlrpc/client.rb (XMLRPC::Client::do_rpc): add charset
-	  information to content-type header.[ruby-core:5127]
-
-	* lib/xmlrpc/server.rb (CGIServer::serve): ditto.
-
-	* lib/xmlrpc/server.rb (ModRubyServer::serve): ditto.
-
-	* lib/xmlrpc/server.rb (WEBrickServlet::service): ditto.
-
-Tue Sep 20 17:34:46 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* test/webrick/test_cgi.rb: set ENV["PATH"] to CGIEnvPath on
-	  windows. bcc32's runtime is not installed into system directory,
-	  so it cannot be found without this setting. [ruby-dev:27166]
-
-Tue Sep 20 17:10:38 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/dbm/test_dbm.rb (TestDBM::test_s_open_error): remove
-	  test_s_open_error test to detect duplicate open.
-	  [ruby-dev:27202]
-
-Tue Sep 20 17:08:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* io.c: PIPE_BUF is not defined on BeOS. use _POSIX_PIPE_BUF instead.
-	  [ruby-dev:27185]
-
-Tue Sep 20 16:53:53 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/readline/test_readline.rb (TestReadline::replace_stdio):
-	  BSD seek support from [ruby-dev:25223].  fixed: [ruby-dev:27150]
-
-Tue Sep 20 15:39:40 2005  why the lucky stiff  <why@ruby-lang.org>
-
-	* ext/syck/emitter.c (syck_scan_scalar): prevent indicators from
-	  appearing alone or at the end of plain scalars. [ruby-core:5826]
-
-	* ext/syck/emitter.c (syck_emit_scalar): treat typed scalar nodes
-	  as complex keys.
-
-	* lib/syck.h: version 0.60.
-
-	* lib/yaml/basenode.rb (YAML::BaseNode#at): transform keys during
-	  key searches.
-
-	* ext/syck/rubyext.c: loading of binary-typed nodes.  prevent
-	  emission of plain strings that look like symbols, but which aren't.
-
-Tue Sep 20 05:50:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* test/xmlrpc/test_webrick_server.rb (setup_http_server):
-	  should not include 'webrick/https' unless 'use_ssl' because
-	  it fails where openssl is not installed.
-
-Tue Sep 20 00:34:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_close): call rb_io_close() directly if io is a T_FILE
-	  object.  [ruby-dev:27156]
-
-Mon Sep 19 19:09:08 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* file.c (rb_file_chown): should accept nil. [ruby-dev:27171]
-	  (backport from trunk, rev 1.208)
-
-Mon Sep 19 18:35:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/dl/dl.c (rb_io_to_ptr): fix DragonFlyBSD support.
-	  [ruby-dev:27151]
-
-Mon Sep 19 14:17:04 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/syck/emitter.c (syck_emit): passing an int* value to the
-	  long* parameter causes unaligned access on LP64 systems.
-	  [ruby-dev:27161]
-
-Mon Sep 19 13:44:03 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: avoid core dump with WIN32OLE_EVENT.
-	  [ruby-dev:27133]
-
-Mon Sep 19 10:36:06 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (cp_r): default is :dereference_root=>true for
-	  backward compatibility. [ruby-dev:27145]
-
-	* test/fileutils/test_fileutils.rb (test_cp_r): test it.
-
-Mon Sep 19 09:57:39 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* test/fileutils/test_fileutils.rb: backported from trunk (1.36).
-	  (again) [ruby-dev:27145]
-
-Mon Sep 19 07:45:37 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_pkey.h, ossl_pkey_rsa.c, ossl_pkey_dsa.c:
-	  an instance variable "private" is added to OpenSSL::PKey class.
-	  this ivar is a flag that shows whether there is a private key
-	  in the instance.
-
-	* ext/openssl/ossl_engine.c: (ossl_engine_load_privkey): set private
-	  key flag.
-
-Mon Sep 19 06:41:32 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb: backported from trunk (rev 1.65):
-
-	* lib/fileutils.rb (rm_r): new option :secure.
-
-	* lib/fileutils.rb (rm_rf): new option :secure.
-
-	* lib/fileutils.rb: new method #remove_entry_secure.
-
-	* lib/fileutils.rb (cd): remove option :noop.
-
-	* lib/fileutils.rb (cp_r): new option :dereference_root.
-
-	* lib/fileutils.rb (cp_r): new option :dereference_root.
-
-	* lib/fileutils.rb: new method #remove_entry.
-
-	* lib/fileutils.rb: new method #chmod_R.
-
-	* lib/fileutils.rb: new method #chown.
-
-	* lib/fileutils.rb: new method #chown_R.
-
-	* lib/fileutils.rb: new method .commands.
-
-	* lib/fileutils.rb: new method .options.
-
-	* lib/fileutils.rb: new method .have_option?.
-
-	* lib/fileutils.rb: new method .options_of.
-
-	* lib/fileutils.rb: new method .collect_method.
-
-	* lib/fileutils.rb: use module_function instead of single extend.
-
-	* test/fileutils/test_fileutils.rb: backported from trunk (1.36).
-
-Mon Sep 19 03:17:48 2005  Tanaka Akira  <akr@m17n.org>
-
-	* file.c (rb_thread_flock): wrap the flock system call by
-	  TRAP_BEG/TRAP_END to enable signals.  [ruby-dev:27122]
-
-	* ext/socket/socket.c (bsock_send): wrap the sendto and send system
-	  call by TRAP_BEG/TRAP_END to enable signals when writing to a socket
-	  which is full.  [ruby-dev:27132]
-
-	* io.c (rb_io_syswrite): wrap the write system call by
-	  TRAP_BEG/TRAP_END to enable signals when writing to a pipe which is
-	  full.  [ruby-dev:27134]
-
-Mon Sep 19 03:02:08 2005  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (io_fwrite): wrap the write system call by TRAP_BEG/TRAP_END to
-	  enable signals when writing to a pipe which is full.
-
-Sun Sep 18 02:10:47 2005  why the lucky stiff  <why@ruby-lang.org>
-
-	* lib/yaml/rubytypes.rb: remove comments that are bungling up
-	  the rdoc and ri output.  output symbols as plain scalars.
-
-	* ext/syck/rubyext.c (syck_emitter_reset): emit headless
-	  documents always.
-
-	* ext/syck/emitter.c (syck_scan_scalar): quote scalars with any
-	  kind of surrounding line space, tabs or spaces alike.
-
-	* ext/syck/token.c: accept tabs as whitespace, not for indentation,
-	  but strip from plain scalars.
-
-	* test/yaml/test_yaml.rb: remove outdated tests.
-
-Sat Sep 17 23:25:04 2005  sheepman  <sheepman@sheepman.sakura.ne.jp>
-
-	* lib/mathn.rb (Rational::inspect): should preserve original
-	  operand.  [ruby-core:05806]
-
-Sat Sep 17 23:20:27 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::Cookie): should handle multiple values for a
-	  cookie name.  [ruby-talk:156140]
-
-Sat Sep 17 10:42:13 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
-	  should call Kernel.eval on caller's safe-level instead of slave's
-	  safe-level (Of course, the given script should be evaluated on
-	  slave's safe-level).
-
-Sat Sep 17 09:45:26 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_substr): should propagate taintness even for
-	  empty strings.  [ruby-dev:27121]
-
-	* string.c (rb_str_aref): should infect result if range argument
-	  is tainted.  [ruby-dev:27121]
-
-Sat Sep 17 08:35:39 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/maker/base.rb (RSS::Maker::ItemsBase#normalize): fixed
-	strange RSS::Maker::Item#max_size behavior.
-	Thanks to Kazuhiko <kazuhiko@fdiary.net>.
-
-	* test/rss/test_maker_1.0.rb (RSS::TestMaker10#test_items): ditto.
-
-Fri Sep 16 23:09:20 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_search_event_at): bug fix
-	  in ext/win32ole/sample/ienavi.rb.
-
-	* ext/win32ole/win32ole/tests/testOLEEVENT.rb: ditto.
-
-Fri Sep 16 22:41:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_s_extname): empty string for path name ending with a
-	  period.  fixed: [ruby-core:05651]
-
-	* file.c (rb_file_join): smarter behavior at edge cases.
-	  fixed: [ruby-core:05706]
-
-Fri Sep 16 18:34:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/syck/node.c (syck_replace_str): was using return from the
-	  void function.  a patch from MIYAMUKO Katsuyuki
-	  <miyamuko at mtb.biglobe.ne.jp>.  [ruby-dev:27111]
-
-Fri Sep 16 14:48:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: fix typo on MultiTkIp#bg_eval_string
-
-Fri Sep 16 12:02:12 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/syck/rubyext.c (syck_resolver_transfer): remove C++ style
-	  comment (//).  [ruby-core:05793]
-
-Fri Sep 16 00:14:14 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/logger/test_logger.rb: unintentionally overwritten changes by
-	  Usa.  reverted.
-
-Fri Sep 16 00:06:18 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#initialize): should set
-	  $stdout.binmode.
-
-Thu Sep 15 23:25:21 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.5.
-
-	  #nnn is a ticket number at http://dev.ctor.org/soap4r
-
-	  * SOAP
-
-	    * allow to configure an envelope namespace of SOAP request. (#124)
-	   	TemporaryNamespace = 'http://www.w3.org/2003/05/soap-envelope'
-	  	@client.options["soap.envelope.requestnamespace"] =
-		  TemporaryNamespace
-	 	@client.options["soap.envelope.responsenamespace"] =
-		  TemporaryNamespace
-		@client.do_proc(...)
-
-	    * let SOAP request XML indent space configuable.  see
-	      "soap.envelope.no_indent" option. (#130)
-
-	    * let external CES configuable.
-	      ex. client["soap.mapping.external_ces"] = 'SJIS'.  $KCODE is used
-	      by default. (#133)
-		external CES ::= CES used in Ruby object of client and server
-		internal CES ::= CES used in SOAP/OM
-
-	    * add iso-8859-1 external CES support. (#106)
-
-	    * fixed illegal 'qualified' handling of elements.  it caused
-	      ASP.NET inteoperability problem. (#144)
-
-	    * added 'soap.envelope.use_numeric_character_reference' (boolean)
-	      option to let query XML use numeric character reference in XML,
-	      not plain UTF-8 character.  !GoogleSearch server seems to not
-	      allow plain UTF-8 character since 2005-08-15 update. (#147)
-
-	    * SOAP::Header::SimpleHeader (de)serialization throws an exception
-	      on !SimpleHeader.on_(in|out)bound when header is a String.  so we
-	      could not use a simple single element headerItem.  fixed.  thanks
-	      to emil. (#129)
-
-	    * out parameter of rpc operation did not work.  (#132)
-
-	    * follow HTTP redirect only if using http-access2.  (#125) (#145)
-
-	    * add a workaround for importing an WSDL whose path begins with
-	      drive letter.  (#115)
-
-	  * WSDL
-
-	    * SOAP Data which is defined as a simpletype was not mapped
-	      correctly to Ruby obj when using wsdl2ruby.rb generated classdef
-	      file. (#123)
-
-	    * rpc/literal support. (#118)
-
-	    * re-implemented local element qualify/unqualify control.  handles
-	      elementFormDefault and form in WSDL.  (#119)
-
-	    * Array of an element which has simpleType causes a crash. (#128)
-
-	    * prarmeterOrder may not contain return part so it can be shorter
-	      than parts size.  Thanks to Hugh.  (#139)
-
-	  * Samples
-
-	    * added !BasicAuth client sample. (#117)
-
-	    * added Base64 client/server sample.
-
-	    * added Flickr SOAP interface client sample. (#122)
-
-	    * added !SalesForce client sample. (#135)
-
-	    * updated Thawte CA certificate for !GoogleAdWords sample.
-
-	    * updated a client script with the newer version made by Johan.
-	      thanks!
-
-	    * shortened long file names. (#120)
-
-	    * fixed typo in authheader sample. (#129)
-
-	    * updated deprecated method usage.  (#138)
-
-Thu Sep 15 23:02:57 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.h (rb_w32_stat): added prototype.
-
-Thu Sep 15 22:35:55 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_signal.rb (test_exit_action): skip the test using
-	  fork on fork-less platforms.
-
-Thu Sep 15 11:39:18 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/dialog.rb: If a dialog does not show up yet,
-	  TkDialogObj#name raises an exception. [ruby-talk:156109]
-
-Thu Sep 15 01:39:19 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/tuplespace.rb (Rinda::TemplateEntry::initialize): pull
-	  up method. Tabs converted to spaces.
-
-Thu Sep 15 00:18:24 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/net/telnet.rb (Net::Telnet::waitfor): replace sysread with
-	  readpartial.  [ruby-talk:127641]
-
-Wed Sep 14 22:40:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (ruby_glob): glob function not using ruby exception system.
-
-Wed Sep 14 01:26:03 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/https.rb: backported from trunk, rev 1.3.
-	  [ruby-dev:25673] (again), [ruby-dev:26617] (again),
-	  [ruby-dev:27062]
-
-	* ext/openssl/lib/net/https.rb: removed.
-
-	* ext/openssl/lib/net/protocols.rb: removed.
-
-	* lib/net/http.rb: #use_ssl?, #use_ssl are moved from net/https.
-
-Tue Sep 13 22:09:40 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/logger.rb (Logger): added formatter accessor to logger for
-	  dictating the way in which the logger should format the messages it
-	  displays.  Thanks to Nicholas Seckar (cf. [ruby-talk:153391]) and
-	  Daniel Berger.
-
-	* lib/logger.rb (Logger): added VERSION constant.
-
-	* lib/logger.rb: removed document for LogDevice. It is an
-	  implementation detail and is not a public interface.
-
-	* test/logger/test_logger.rb: added tests.
-
-Tue Sep 13 21:47:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (BEGIN_CALLARGS): pop halfly pushed status.
-	  fixed: [ruby-dev:26881]
-
-Tue Sep 13 16:26:45 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: backported from trunk, rev 1.128.
-	  [ruby-dev:25673] [ruby-dev:26617]
-
-	* lib/net/protocol.rb: backported from trunk, rev 1.78.
-
-	* lib/net/protocol.rb: new method #old_open to support net/smtp
-	  and net/pop.
-
-	* lib/net/smtp.rb: use #old_open.
-
-	* lib/net/pop.rb: ditto.
-
-Tue Sep 13 12:33:05 2005  why the lucky stiff  <why@ruby-lang.org>
-
-	* lib/yaml.rb: reworking YAML::Stream to use the new
-	  emitter.
-
-	* lib/yaml/stream.rb: ditto.
-
-	* lib/yaml/rubytypes.rb: added Object#yaml_new.
-
-	* lib/yaml/tag.rb: the tag_subclasses? method now
-	  shows up in the class.  allow taguri to be set using an accessor.
-	  continue support of Object#to_yaml_type.
-
-	* ext/syck/rubyext.c: new emitter code.  yaml_new and yaml_initialize
-	  get called, should they be present.  consolidated all the diaspora of internal
-	  node types into the family below YAML::Syck::Node -- Map,
-	  Seq, Scalar -- all of whom are SyckNode structs pointing to
-	  Ruby data.  moved Object#yaml_new into the node_import and made it the
-	  default behavior.  the target_class is always called wih yaml_new, prepended
-	  a parameter, which is the klass.  loaded nodes through GenericResolver show their style.
-	  new Resolver#tagurize converts type ids to taguris.
-
-	* ext/syck/implicit.re: were 'y' and 'n' seriously omitted??
-
-	* ext/syck/emitter.c: renovated emitter, walks the tree in advance.
-	  consolidated redundant block_styles struct into
-	  the scalar_style struct.  (this means loaded nodes can now
-	  be sent back to emitter and preserve at least its very basic
-	  formatting.)
-
-	* ext/syck/gram.c: headless documents of any kind allowed.
-
-	* ext/syck/node.c: new syck_replace_str methods and syck_empty_*
-	  methods for rewriting node contents, while keeping the ID
-	  and other setup info.  added syck_seq_assign.
-
-	* ext/syck/syck.h: reflect block_styles and new node functions.
-
-Mon Sep 12 20:53:06 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* test/openssl/test_pkcs7.rb (test_enveloped): skip this test
-	  to avoid a bug of PKCS7_enctypt() (only if ext/openssl is
-	  compiled with OpenSSL-0.9.7d or earlier versions).
-	  http://www.mail-archive.com/openssl-dev@openssl.org/msg17376.html
-
-Mon Sep 12 14:03:33 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/dbm/test_dbm.rb: remove locking test, which may not be
-	  supported on some platforms.  [ruby-dev:27030]
-
-Mon Sep 12 10:45:58 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/dl/dl.c (rb_io_to_ptr): merged a patch for DragonFly BSD
-	  from Takahiro Kambe <taca at back-street.net>.  [ruby-dev:27023]
-
-Sun Sep 11 22:05:51 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* bin/erb (ERB::Main#run): set ERB#filename so that it is used
-	  when reporting syntax/runtime errors. Tabs converted to spaces.
-
-Sat Sep 10 10:17:03 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_engine.c (ossl_engine_s_by_id):
-	  OpenSSL::Engine.by_id calls given block before calling
-	  ENGINE_init (block parameter is the return value of this method
-	  itself).  this functionality is useful to load dynamic shared
-	  engines. the following code is a sample of loading a key using
-	  OpenSC PKCS #11 module.
-
-		require "openssl"
-		pkcs11 = OpenSSL::Engine.by_id("dynamic"){|e|
-		  e.ctrl_cmd("SO_PATH", "/usr/lib/opensc/engine_pkcs11.so")
-		  e.ctrl_cmd("LIST_ADD", "1")
-		  e.ctrl_cmd("LOAD")
-		}
-		pkcs11.ctrl_cmd("PIN", "secret")
-		key = pkcs11.load_private_key
-
-	* ext/openssl/ossl_engine.c (ossl_engine_ctrl_cmd): new method
-	  OpenSSL::Engine#ctrl_cmd. it wraps ENGINE_ctrl_cmd_string.
-
-	* ext/openssl/ossl_engine.c (ossl_engine_get_cmds): new method
-	  OpenSSL::Engine#cmds. it returms engine command definitions.
-
-Sat Sep 10 10:09:47 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_asn1.c (asn1str_to_str): new function.
-
-	* ext/openssl/ossl_pkcs7.c: new class OpenSSL::PKCS7::RecipientInfo.
-	  this class wraps PKCS7_RECIP_INFO struct.
-
-	* ext/openssl/ossl_pkcs7.c: OpenSSL::PKCS7::Signer is renamed to
-	  OpenSSL::PKCS7::SignerInfo. ("Signer" remains as an alias of
-	  SignerInfo.)
-
-	* test/openssl/test_pkcs7.rb: new file.
-
-Sat Sep 10 10:05:51 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): assume that
-	  the argument is a DER string if Base64 decoding failed.
-
-	* ext/openssl/ossl_ns_pki.c (ossl_spki_to_der): new method.
-
-	* test/openssl/test_ns_spki.rb: add new file.
-
-Sat Sep 10 09:56:24 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/digest.rb: added SHA224, SHA256, SHA384 and SHA512.
-	  these features are enabled if this library is compiled with
-	  OpenSSL 0.9.8 or later.
-
-	* test/openssl/test_digest.rb: add test for new digests.
-
-Sat Sep 10 09:51:30 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl.c (ossl_raise): should use ERR_peek_last_error
-	  to get last error on the current thread. And should report
-	  errors on the stack while OpenSSL.debug is true.
-
-	* ext/openssl/ossl.c (ossl_get_errors): new method for debugging
-	  this library.
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_set_ciphers): fix error message.
-
-	* ext/openssl/ossl_x509req.c (ossl_x509req_set_attributes): get rid
-	  of unused variable.
-
-	* ext/openssl/ossl_x509store.c (ossl_x509store_initialize): should
-	  set @time to avoid warning.
-
-	* ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths,
-	  X509_STORE_add_cert, X509_STORE_add_crl): should raise error if
-	  wrapped functions failed.
-
-	* test/openssl/test_x509store.rb: add test for errors.
-
-Fri Sep  9 22:13:19 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call0): prohibit calling tainted method (>2) when
-	  $SAFE == 0.
-
-Fri Sep  9 16:45:25 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_times): make empty strings to keep taintness,
-	  and a little improvement.  [ruby-dev:26900]
-
-	* ext/iconv/iconv.c (iconv_try), ext/iconv/extconf.rb: get rid of meta
-	  characters in command line option.  fixed: [ruby-talk:155369]
-
-Thu Sep  8 14:58:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* merged a patch from Takahiro Kambe <taca at back-street.net> to
-	  support DragonFly BSD.  [ruby-dev:26984]
-
-Wed Sep  7 12:55:08 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb: abolish mod === tempfile to avoid a problem
-	  [ruby-dev:26967].
-
-Wed Sep  7 10:45:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_thread_switch): convert all exceptions to
-	  SystemExit.  fixed: [ruby-core:05724]
-
-	* eval.c (rb_thread_terminated): show backtrace before propagate
-	  exceptions to main thread.
-
-Wed Sep  7 08:35:04 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in, configure.in (MINIOBJS): miniruby on HP-UX can not load
-	  extension libraries.
-
-	* bignum.c (bignew_1, bigadd): K&R style argument actually can't be
-	  defined as char.
-
-	* missing/vsnprintf.c: ANSI compiler supports const keyword.
-
-	* ext/digest/sha2/extconf.rb: reject platforms which has inttypes.h
-	  but no 64bit integer.
-
-	* lib/mkmf.rb (what_type?): guesstimate type.
-
-	* ext/etc/etc.c (setup_passwd), ext/etc/extconf.rb: pw_age might be
-	  char*.  fixed: [ruby-core:05470]
-
-Wed Sep  7 08:32:47 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_mod_cvar_get, rb_mod_cvar_set): document fix from
-	  sheepman <sheepman@sheepman.sakura.ne.jp>; a bug in visibility
-	  description.  [ruby-dev:26965]
-
-	* sprintf.c (rb_f_sprintf): warn "too many argument" on verbose
-	  mode (-v/-w); backported from 1.9.  [ruby-dev:26963]
-
-Mon Sep  5 17:03:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/ostruct.rb: a patch from Florian Gross <florgro at gmail.com>
-	  merged to allow recursive inspect (and to_s) for OpenStruct.
-	  [ruby-core:05532]
-
-Mon Sep  5 07:01:12 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/openssl/lib/openssl/buffering.rb (Buffering#do_write):
-	  should clear data from the buffer which already been output.
-
-Fri Sep  2 23:51:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib: do not use __send__ to access private methods.  [ruby-dev:26935]
-
-Fri Sep  2 03:29:00 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
-
-	* lib/irb/init.rb: make IRB -I option that is same befavior for ruby.
-	  [ruby-dev:26872], [ruby-dev: 26920]
-
-	* lib/irb/locale.rb: support to print help message when OS locale is
-	  ja_JP.utf-8. [ruby-dev:26872]
-
-Thu Sep  1 17:11:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call0): wrong condition for $SAFE restoration.
-
-Thu Sep  1 14:12:45 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: On Tcl8.5, MultiTkIp#invoke_hidden doesn't
-	  work (gives wrong order of arguments).
-
-	* ext/tk/lib/multi-tk.rb: add MultiTkIp#invoke_hidden_on_namespace
-	  to support '-namespace' option of 'interp invokehidden' command
-	  on Tcl8.5.
-
-Wed Aug 31 14:43:15 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (OPTFLAGS): default global optimization to
-	  disabled for all VC++ versions.  fixed: [ruby-dev:26897]
-
-Wed Aug 31 11:35:43 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/gdbm/test_gdbm.rb (teardown): should remove GDBM temporary
-	  file.
-
-Wed Aug 31 10:30:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* process.c (proc_detach, proc_setmaxgroups): missing argument type
-	  declaration. (I recommend ANSI-style function)
-
-Tue Aug 30 23:20:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_rescue2): initialization miss.  fixed: [ruby-dev:26917]
-
-	* lib/mkmf.rb (xsystem, xpopen): no longer expand by Config.
-
-	* lib/mkmf.rb (link_command, cc_command, cpp_command): expand
-	  variables at once, and quote hdrdir.  fixed: [ruby-core:05680]
-
-	* lib/mkmf.rb (libpathflag): quote paths.
-
-Tue Aug 30 19:34:27 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/digest/md5/md5ossl.h, ext/digest/rmd160/rmd160ossl.h,
-	  ext/digest/sha1/sha1ossl.h: include <stddef.h> to avoid
-	  error in compilation with OpenSSL-0.9.8. [ruby-list:41068]
-
-Mon Aug 29 19:54:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/rdoc/usage.rb: improper exceptions. [ruby-dev:26870]
-
-	* lib/rdoc/usage.rb: support the case when non-ruby code exists before
-	  shebang. (this is needed when ri.bat is executed on windows)
-
-Mon Aug 29 17:48:17 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (method_arity): should return proper arity value.
-	  [ruby-dev:26390]
-
-Mon Aug 29 01:19:57 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/time.rb (Time.parse): extract fractional seconds using
-	  Date._parse.  [ruby-talk:153859]
-
-Sat Aug 27 20:20:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/curses/curses.c ({curses,window}_clrtoeol): added. suggested
-	  by Reyn Vlietstra.
-
-	* ext/curses/curses.c: chtype in curses is not `char', rahter `long'.
-	  [ruby-Bugs:2298]
-
-	* ext/curses/view.rb: String =~ String is deprecated.
-
-Wed Aug 24 10:53:28 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/logger/test_logger.rb (test_shifting_size): should close log
-	  device before unlink, since some platform cannot unlink opened
-	  file.
-
-Sun Aug 21 00:13:27 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/wsdl/xmlSchema/importer.rb (WSDL::XMLSchema::Importer#fetch): add
-	  a workaround for importing an WSDL whose path begins with drive
-	  letter.  [ruby-dev:26242]
-
-Sat Aug 20 22:37:13 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/logger.rb (write, shift_log?, shift_log): file shifting race
-	  condition bug fixed.  [ruby-dev:26764]
-
-	* test/logger/test_logger.rb: tests.
-
-Fri Aug 19 18:13:39 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/time.rb (Time.apply_offset): fix a problem with last day of
-	  month.  reported by Lucas Nussbaum.  [ruby-talk:152866]
-
-Thu Aug 18 12:46:28 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/Makefile.sub (COMMON_HEADERS): reverted 1.42.2.24.
-	  I misunderstood, bccwin32 on ruby_1_8 uses winsock2 originally.
-	  [ruby-dev:26806]
-
-	* win32/win32.h: include winsock2.h instead of winsock.h. (bcc32)
-
-Wed Aug 17 23:58:05 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_to_integer): argument constified.
-
-	* eval.c (terminate_process): take String message.
-
-	* eval.c (rb_thread_switch): propagate the exception caused thread
-	  termination directly.  fixed: [ruby-core:05552]
-
-Wed Aug 17 00:05:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_add_method): preserve safe level in the environment
-	  where a method is defined .
-
-	* eval.c (rb_call0): restore preserved safe level in the method
-	  execution.
-
-Mon Aug 15 00:38:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_rescue2): reduce PUSH_TAG() as well as NODE_RESCUE.
-	  [ruby-dev:26800]
-
-	* range.c (range_check, range_init): reduce useless exceptions.
-
-Sat Aug 13 18:51:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_block_pass): distinguish current block from others.
-	  fixed: [ruby-dev:26274]
-
-	* ext/stringio/stringio.c (strio_set_string): disallow nil.
-	  http://www.rubyist.net/~nobu/t/20050811.html#c05
-
-Thu Aug 11 23:29:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c: keep holding string after closed.
-
-Thu Aug 11 13:01:48 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss: fixed sort bug. [ruby-list:41018]
-
-	* lib/rss/1.0.rb (RSS::RDF::Channel#setup_maker_attributes):
-	  removed self.
-
-	* lib/rss/maker/base.rb (RSS::Maker::ItemsBase#<=>): use #date
-	  instead of @date.
-	  (RSS::Maker::Base::self.def_array_element): added #size.
-
-	* lib/rss/maker/1.0.rb
-	  (RSS::Maker::RSS10::Channel#to_rss,
-	   RSS::Maker::RSS10::Items::Item#to_rss): cleared dc_dates set
-	  upped by using #date.
-
-	* lib/rss/maker/dublincore.rb
-	  (RSS::Maker::ChannelBase, RSS::Maker::ItemsBase::ItemBase):
-	  fixed opposite alias.
-
-	* test/rss/test_setup_maker_1.0.rb
-	  (RSS::TestSetupMaker10::test_setup_maker_items_sort): added some
-	  tests for RSS::Maker::ItemsBase#do_sort.
-
-Wed Aug 10 10:29:40 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: fix bug on handling __ruby2val_optkeys().
-
-	* ext/tk/lib/tk/itemconfig.rb: fix bug on handling
-	  __item_ruby2val_optkeys().
-
-	* ext/tk/lib/tk/canvas.rb: didn't check __item_ruby2val_optkeys().
-
-	* ext/tk/lib/tkextlib/blt/component.rb: ditto.
-
-Tue Aug  9 15:12:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: remove dangerous 'rb_jump_tag's.
-
-	* ext/tk/lib/tk.rb: add __val2ruby_optkeys and __ruby2val_optkeys to
-	  help to convert option values between ruby and tcl.
-
-	* ext/tk/lib/tk/itemconfig.rb: add __item_val2ruby_optkeys and
-	  __item_ruby2val_optkeys to help to convert option values between
-	    ruby and tcl.
-
-	* ext/tk/lib/tk/radiobutton.rb: use __ruby2val_optkeys for 'variable'
-	  option (for the reason of backward compatibility).
-
-	* ext/tk/lib/tk/composite.rb: clarify the arguments of super().
-
-	* ext/tk/lib/tk/spinbox.rb: ditto.
-
-	* ext/tk/lib/tk/text.rb: ditto.
-
-	* ext/tk/lib/tk/validation.rb: ditto.
-
-	* ext/tk/lib/tkextlib/*: support to treat tkvariable-type
-	  configure options.
-
-Tue Aug  9 20:30:19 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
-
-	* bignum.c (rb_big_coerce): allow bignum x bignum coercing.
-	  [ruby-dev:26778]
-
-Mon Aug  8 20:43:02 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/ruby/test_method.rb: added.  [ruby-dev:26761]
-
-Sun Aug  7 23:50:14 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/ruby/test_super.rb: added from HEAD. [ruby-dev:26743]
-
-Sun Aug  7 01:31:15 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (WIN32OLE_EVENT#on_event): should set
-	  only one event handler.
-
-	* ext/win32ole/tests/testOLEEVENT.rb: ditto.
-
-	* ext/win32ole/tests/testOLEPARAM.rb: remove re-defined
-	  test_ole_type_detail method.
-
-Sat Aug  6 12:35:24 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/{tk.rb,tk/itemconfig.rb}: configure creates
-	  TkVariable if key name is 'variable' or 'textvariable'
-	  by default. [ruby-dev:26749]
-
-	* ext/tk/lib/tk/{label,radiobutton}.rb: removed its own
-	  {variable,textvariable} function.
-
-	* ext/tk/lib/tk/variable.rb: retains backward conpatibility.
-
-Fri Aug  5 12:50:32 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/tcltklib/tcltklib.c: fixed memory leak when tk_funcall raised
-	  exception. (copies argv into heap in tk_funcall instead of
-	  caller)
-
-Fri Aug  5 12:42:57 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): need to convert path separetor
-	  before invoking install command.
-
-Fri Aug  5 00:27:04 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/tcltklib/tcltklib.c: refactoring - extract ruby string <->
-	  tcl object conversion as get_str_from_obj and get_obj_from_str.
-
-Fri Aug  5 00:19:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* extmk.rb (extmake): needs to be wrapped in an Array.
-
-Thu Aug  4 18:38:36 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: cannot compile for Tcl7.6/Tk4.2.
-
-	* ext/tcltklib/tcltklib.c: add nativethread consistency check.
-
-	* ext/tcltklib/stubs.c: ditto.
-
-	* ext/tk/lib/tk.rb: forgot to define TclTkIp.encoding and encoding=
-	  when Tcl is 7.6 or 8.0.
-
-	* ext/tk/lib/tk/wm.rb: support to make some methods as options of
-	  root or toplevel widget. [ruby-talk:150336]
-
-	* ext/tk/lib/tk/root.rb: ditto.
-
-	* ext/tk/lib/tk/toplevel.rb: ditto.
-
-	* ext/tk/lib/tkextlib/SUPPRT_STATUS: update RELEASE_DATE
-
-Thu Aug  4 08:03:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (extmake): should not modify $mflags for each
-	  extentions.
-
-Thu Aug  4 00:25:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk, Makefile.in, {bcc32,win32,wince}/Makefile.sub: integrated
-	  macro definitions.
-
-	* bcc32/Makefile.sub: LIBRUBY_SO should use DLDOBJS, not EXTOBJS.
-
-	* {win32,wince}/Makefile.sub: separate config.h for compiler versions.
-
-Wed Aug  3 21:59:16 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/variable.rb: TkVariable#trace didn't work on
-	  TkVariable retrived from TkVariable.new_hash.ref. [ruby-dev:26721]
-
-Wed Aug  3 08:22:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (ruby_connect): revert [ruby-talk:111654]
-	  changes at 2004-09-07.  [ruby-dev:26656]
-
-Tue Aug  2 10:20:54 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/tcltklib/tcltklib.c: use Tcl_[GS]etVar2Ex instead of
-	  Tcl_Obj[GS]etVar2. (avoid Tcl_NewStringObj on supported platforms)
-
-	* ext/tcltklib/tcltklib.c: use ip_{get,set,unset}_variable2_core from
-	  ip_{get,set,unset}_variable.
-
-	* ext/tcltklib/tcltklib.c: replaced Tcl_Panic with rb_bug.
-
-Tue Aug  2 01:41:28 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/ping.rb (Ping.pingecho): should rescue StandardError.
-	  [ruby-dev:26677]
-
-Mon Aug  1 19:09:41 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/tcltklib/tcltklib.c: refactoring - replaced rb_ivar_defined &
-	  rb_ivar_get with single rb_attr_get call.
-
-Mon Aug  1 18:45:07 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/tcltklib/tcltklib.c (Tcl_GetStringResult): refactoring - define
-	  alternative macro on Tcl7.x or earlier.
-
-Mon Aug  1 13:57:35 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/tcltklib/tcltklib.c (deleted_ip): refactoring - interpreter
-	  deletion check. [ruby-dev:26664]
-
-Mon Aug  1 01:17:40 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb (check_insecure_method): use private_methods and
-	  protected_methods instead of respond_to? to check method visibility.
-	  [ruby-dev:26616]
-
-	* test/drb/drbtest.rb: ditto.
-
-	* test/drb/ut_drb.rb: ditto.
-
-Mon Aug  1 00:07:32 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
-	* lib/irb/context.rb: fix `irb --readline` option. [ruby-list:40955]
-
-Fri Jul 29 09:59:38 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_yield_0): push yielded node instead of yielding.
-	  fixed: [yarv-dev:549]
-
-Thu Jul 28 18:09:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/stubs.c: When --enable-tcltk-stubs, the initialize
-	  routine creates a Tcl/Tk interpreter and deletes it. However,
-	  init cost of Tk's MainWindow is not so small. And that makes it
-	  impossible to use libraries written with Tcl functions only on
-	  an environment without a graphical display. This changes support
-	  delaying initalization of Tk_Stubs until the script needs Tk.
-
-	* ext/tcltklib/stubs.h: New file. Define prototypes and return
-	  codes of functions on stubs.c.
-
-	* ext/tcltklib/tcltklib.c: Support delaying initalization of
-	  Tk_Stubs until the script needs Tk.
-
-	* ext/tcltklib/tcltklib.c: Show friendly error messages for errors
-	  on initialization.
-
-	* ext/tcltklib/tcltklib.c: Avoid SEGV on ip_finalize() when ruby is
-	  exiting and $DEBUG is true. (Not fix. If you know the reason of
-	  why, please fix it.)
-
-	* ext/tk/tkutil.c (ary2list, ary2list2): bug fix on handling of
-	  encoding.
-
-	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
-	  don't work propery.
-
-	* ext/tk/lib/tk.rb: Forget extending Tk::Encoding module to Tk.
-	* ext/tk/lib/tk/variable.rb: TkVarAccess fails to initialize the
-	  object for an element of a Tcl's array variable.
-
-Wed Jul 27 23:23:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (obj_free): make message format consistent with one from
-	  gc_mark().  [ruby-talk:149668]
-
-Wed Jul 27 22:11:37 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* sample/rss/tdiary_plugin: removed. because the plugin
-	  is imported in the tDiary plugin packages.
-
-Wed Jul 27 10:59:02 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (dir_each): rewinddir(3) before iteration.
-	  [ruby-talk:149628]
-
-Tue Jul 26 12:57:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/openssl_missin.c: include <openssl/engine.h> before
-	  <openssl/x509_vfy.h> to avoid compilation error of mswin32.
-	  suggested by NAKAMURA Usaku.
-
-Mon Jul 25 21:30:46 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* {bcc32,win32,wince}/Makefile.sub: moved CPPFLAGS only for ruby
-	  source to XCFLAGS.
-
-Mon Jul 25 13:45:18 2005  NAJIMA Hiroki  <najima@mickey.ai.kyutech.ac.jp>
-
-	* io.c: check HAVE_SYS_IOCTL_H before including the header.
-	  [ruby-dev:26610]
-
-Mon Jul 25 14:10:02 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: fix en-bugged part in the last commit.
-
-Sat Jul 23 16:49:04 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_engine.c (ossl_engine_s_load): should check
-	  OPENSSL_NO_STATIC_ENGINE.
-
-Fri Jul 22 21:06:08 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
-
-	* bignum.c (rb_big_eq): reduce isnan().  [ruby-dev:26600]
-
-	* numeric.c (flo_eq, flo_gt, flo_ge, flo_lt, flo_le): ditto.
-
-Fri Jul 22 15:02:39 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: moved copyright description to lib/rss.rb.
-
-	* lib/rss.rb: added for convenience.
-
-	* sample/rss/re_read.rb: added #to_s sample.
-
-	* sample/rss/blend.rb: use 'require "rss"' instead of
-	  'require "rss/*"'.
-	* sample/rss/list_description.rb: ditto.
-	* sample/rss/rss_recent.rb: ditto.
-	* sample/rss/tdiary-plugin/rss-recent.rb: ditto.
-
-	* sample/rss/tdiary-plugin/rss-recent.rb: 0.0.6 -> 0.0.7.
-
-Fri Jul 22 14:37:43 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/parser.rb (RSS::Parser#initialize): accept HTTP/FTP
-	  URI and local file path too.
-
-	* test/rss/test_parser.rb (RSS::TestParser#test_parse): test
-	  for the above.
-
-Fri Jul 22 07:01:42 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tkutil.c (tk_conv_args): forget to revert thread_critical
-	  and gc_disable when raise ArgumentError.
-
-	* ext/tk/lib/remote-tk.rb: RemoteTkIp doesn't need to include TkUtil.
-
-	* ext/tcltklib/tcltklib.c: add TclTkIp#has_mainwindow? method.
-
-	* ext/tk/lib/tk.rb: add Tk.has_mainwindow? method.
-
-	* ext/tk/lib/multi-tk.rb: add MultiTkIp#has_mainwindow? method.
-
-	* ext/tk/lib/remote-tk.rb: add RemoteTkIp#has_mainwindow? method.
-
-	* ext/tk/lib/multi-tk.rb: slave IP fail to exit itself when $SAFE==4.
-
-	* ext/tk/lib/multi-tk.rb: remove constants from MultiTkIp module to
-	  avoid access from external.
-
-	* ext/tk/lib/multi-tk.rb: check_root flag is ignored on slave IPs'
-	  mainloop.
-
-	* ext/tk/lib/multi-tk.rb: hang-up Tk.mainloop called on a slave IP
-	  with $SAFE==4.
-
-	* ext/tk/lib/multi-tk.rb: MultiTkIp#bg_eval_proc doesn't work
-	  properly.
-
-	* ext/tk/lib/multi-tk.rb: add MultiTkIp#set_cb_error(proc) and
-	  cb_error(exc) to log errors at callbacks on safe slave IPs.
-
-	* ext/tk/lib/multi-tk.rb: fail to get an available slave IP object
-	  when call Tk.mainloop in the block which is given to new_* method,
-	    because cannot finish initialize while the root widget is alive.
-
-	* ext/tk/lib/multi-tk.rb: fail to control a slave IP when Tk.mainloop
-	  runs on the IP.
-
-Wed Jul 20 19:20:37 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (S_ISREG): need to define S_ISREG before it is used first.
-
-Wed Jul 20 18:40:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* io.c (wsplit_p): patch for the environment where
-	  fcntl(F_GETFL, O_NONBLOCK) is not supported. in that case,
-	  set FMODE_WSPLIT without fcntl check. [ruby-dev:26566]
-
-Wed Jul 20 18:07:11 2005  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (rb_io_ctl): update FMODE_WSPLIT_INITIALIZED and FMODE_WSPLIT
-	  by F_SETFL.
-
-Wed Jul 20 10:04:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_class_path): need to adjust snprintf() len for
-	  teminating NUL.  [ruby-dev:26581]
-
-Wed Jul 20 04:01:55 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/socket/socket.c: sorry, BeOS also uses HAVE_CLOSESOCKET,
-	  so reverted.
-
-	* ext/socket/extconf.rb: should not define HAVE_CLOSESOCKET
-	  on windows.
-
-Wed Jul 20 03:16:43 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/socket/socket.c: should not undef close() on win32.
-	  it's defined to rb_w32_close(), otherwise handle leaks.
-	  [ruby-Bugs-2131]
-
-Wed Jul 20 00:48:16 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (syserr_initialize): don't use str before StringValue()
-	  check.  [ruby-dev:26579]
-
-Tue Jul 19 22:47:29 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (syserr_initialize): add 1 byte for snprintf() size for
-	  NUL at the end.  [ruby-dev:26574]
-
-Tue Jul 19 16:39:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_inspect): replace sprintf() with "%s" format all
-	  over the place by snprintf() to avoid integer overflow.
-
-Tue Jul 19 14:08:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/tcltklib/tcltklib.c: rbtk_eventloop_depth is used as int.
-
-	* ext/tcltklib/tcltklib.c: rbtk_pending_exception is tested with
-	  NIL_P, so should assign Qnil instead of 0 (Qfalse).
-
-	* ext/tcltklib/tcltklib.c (ip_invoke_real): fixed memory leak when
-	  ip is deleted.
-
-Tue Jul 19 13:19:46 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/variable.rb: For symmetry, add TkVariable#string. It
-	  returns a string even if the default value type of the TkVariable
-	  object is not "string".
-
-Mon Jul 18 21:40:20 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* eval.c (rb_call0): make the pointer to NODE volatile
-	  instead of NODE itself.
-
-Mon Jul 18 14:32:21 2005  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (rb_call0): make body volatile to avoid optimization problem.
-	  [ruby-dev:26195]
-
-Mon Jul 18 12:23:27 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/io/wait/wait.c: wrong backport from trunk.  fixed: [ruby-dev:26562]
-
-Mon Jul 18 09:36:25 2005  Tanaka Akira  <akr@m17n.org>
-
-	* rubyio.h (FMODE_WSPLIT, FMODE_WSPLIT_INITIALIZED): new constant.
-
-	* io.c (wsplit_p): new function.
-	  (io_fwrite): split writing data by PIPE_BUF if wsplit_p is true in
-	  multi-threaded mode.
-	  [ruby-dev:26540]
-
-Sun Jul 17 13:46:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/wait/extconf.rb, ext/io/wait/wait.c: Win32 platforms support.
-
-Fri Jul 15 23:59:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rdoc/parsers/parse_c.rb (handle_class_module): handle a
-	  module enclosed in a built-in module.  fixed: [ruby-talk:148239]
-
-	* lib/rdoc/parsers/parse_c.rb (find_body): allow macros as methods.
-
-	* lib/rdoc/parsers/parse_c.rb (find_call_seq): allow :nodoc: modifier
-	  in C.  [ruby-core:04572]
-
-Fri Jul 15 18:00:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/Makefile.sub (COMMON_HEADERS): ruby_1_8 is using winsock.h.
-	  failed to compile ext/socket on bcc5.6.4. [ruby-dev:26193]
-
-Fri Jul 15 07:58:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/server.rb (WEBrick::GenericServer#accept_client):
-	  sockets should be non-blocking mode. [ruby-dev:26405]
-
-	* lib/webrick/utils.rb (WEBrick::Utils.set_non_blocking): new method.
-
-	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#read_chunked):
-	  should call sock.read repeatedly until the preferred size data
-	  is obtained.
-
-Thu Jul 14 18:27:16 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.c (rb_w32_strerror): should return correct message
-	  for ENAMETOOLONG and ENOTEMPTY. (bcc32) [ruby-dev:26533]
-
-	* win32/win32.c (rb_w32_strerror): stripped CR LF on the tail.
-	  (bcc32) [ruby-dev:26533]
-
-Thu Jul 14 00:45:42 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* LEGAL (ext/nkf/nkf-utf8): updated from nkf1.7 to nkf-utf8.
-
-Wed Jul 13 19:37:47 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.c (rb_w32_mkdir): should set EEXIST (not EACCES)
-	  if file or directory already exists. (bcc32) [ruby-dev:26508]
-
-	* win32/win32.c (rb_w32_rmdir): should set ENOTDIR (not EINVAL)
-	  if it is not directory. (bcc32, win32)
-
-	* win32/win32.c (rb_w32_rmdir, rb_w32_unlink): restore
-	  FILE_ATTRIBUTE_READONLY flag on function failure.
-
-Wed Jul 13 12:40:00 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: TclTkLib.do_one_event doesn't work.
-
-	* ext/tk/lib/tk.rb: Tk.thread_update is available.
-
-Tue Jul 12 23:32:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb: keep curdir unexpanded.
-
-Mon Jul 11 08:31:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* regex.c (read_special): fix parsing backslashes following \c in
-	  regexp.  fixed: [ruby-dev:26500]
-
-Mon Jul 11 02:53:00 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line):
-	  mistook in merging the patch of [ruby-dev:26235] at
-	  revision 1.4.2.6.
-
-Sun Jul 10 23:58:04 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb (Pathname#unlink): try Dir.unlink first to
-	  avoid unlink a directory by root.
-	  cf. [ruby-dev:26237]
-
-Sun Jul 11 05:18:17 2005  Michael Neumann  <mneumann@ruby-lang.org>
-
-	* lib/xmlrpc/server.rb (XMLRPC::Server): Switch from GServer over to
-	  WEBrick. This makes file lib/xmlrpc/httpserver.rb obsolete (at least it is
-		no further used by the XML-RPC library).
-
-Sun Jul 10 12:47:01 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/debug.rb (debug_command): added a deficient format specifier.
-	  fixed: [ruby-core:05419]
-
-Sat Jul  9 21:28:46 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_method_dispid): convert dispid
-	  in Ruby and C by INT2NUM and NUM2INT.
-
-	* ext/win32ole/win32ole.c (ole_invoke2): ditto.
-
-	* ext/win32ole/test/testWIN32OLE.rb: ditto.
-
-	* ext/win32ole/test/testOLEMETHOD.rb: ditto.
-
-Fri Jul  8 15:45:04 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (RSS::VERSION): 0.1.4 -> 0.1.5.
-
-	* test/rss/test_version.rb (RSS::TestVersion#test_version):
-	  ditto.
-
-	* lib/rss/0.9.rb (RSS::Rss::Channel::Item::Category):
-	  domain attribute of <category> is optional. Thanks to
-	  Chris Lee <clee@kde.org>.
-
-	* test/rss/test_parser.rb (RSS::TestParser#test_category20):
-	  adjusted test case.
-
-Tue Jul  5 23:44:06 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* instruby.rb: expand source library path.
-
-Tue Jul  5 23:27:14 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (sort_2): get rid of yet another bcc's bug.
-	  fixed: [ruby-core:05152]
-
-	* eval.c (rb_thread_save_context): must not switch contexts during
-	  re-allocating stack.  fixed: [ruby-core:05219]
-
-Tue Jul  5 15:15:10 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tkutil.c: fix typo.
-
-Tue Jul  5 14:51:35 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: bug fix on treating Unicode strings.
-
-	* ext/tcltklib/tcltklib.c: add methods to treat encoding mode.
-
-	* ext/tcltklib/MANUAL.eng: add description of TclTkLib#encoding,
-	  encoding_system, and so on.
-
-	* ext/tcltklib/MANUAL.euc: ditto.
-
-	* ext/tk/tkutil.c: fail to create a Tcl's list string from an
-	  array including multiple kind of encoded strings.
-
-	* ext/tk/lib/tk.rb: ditto.
-
-	* ext/tk/lib/multi-tk.rb: 2nd arg of _{to|from}UTF8 is omissible.
-
-	* ext/tk/lib/remote-tk.rb: ditto.
-
-	* ext/tk/lib/tk.rb: override TclTkLib#encoding and encoding= to
-	  use TkCore::INTERP.encoding and encoding=.
-
-	* ext/tk/lib/tk.rb: when "require 'tk'" and $KCODE=='NONE', check
-	  DEFAULT_TK_ENCODING to decide Ruby/Tk's system encoding mode.
-
-	* ext/tk/lib/tk/encodedstr.rb: check both of Tk.encoding and
-	  Tk.encoding_system. Tk.encoding has higher priority.
-
-	* ext/tk/lib/tk/optiondb.rb: ditto.
-
-	* ext/tk/lib/tk/spinbox.rb: ditto.
-
-	* ext/tk/lib/tk/validation.rb: ditto.
-
-	* ext/tk/lib/tk/namespace.rb: arguemnts for TclTkIp#_merge_tklist
-	  should be UTF-8 strings.
-
-Mon Jul  4 14:35:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sample/svr.rb: service can be stopped by ill-behaved client; use
-	  tsvr.rb instead.
-
-Mon Jul  4 13:25:21 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* missing/erf.c: original erf.c by prof. Okumura is confirmed to
-	  be public domain.  reverted BSD implementation.
-
-Mon Jul  4 11:15:37 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/{dbm,gdbm,sdbm}/test_{dbm,gdbm,sdbm}.rb: skip some tests
-	  which using fork on fork-less platforms.
-
-Sun Jul  3 23:26:30 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/wsdl/document/test_rpc.rb: compare formatted time string of
-	  Time objects instead of comparing Time objects itself to avoid
-	  unintended conflict of usec part.  [ruby-dev:26220]
-
-Sat Jul  2 22:41:04 2005  Tanaka Akira  <akr@m17n.org>
-
-	* ext/socket/socket.c (unix_send_io, unix_recv_io): support x86-64 and
-	  IA64.
-
-Sat Jul  2 17:06:23 2005  Tanaka Akira  <akr@m17n.org>
-
-	* defines.h (FLUSH_REGISTER_WINDOWS): defined for IA64.
-	  (flush_register_windows): declare flush_register_windows.
-
-	* eval.c (flush_register_windows): new function.
-
-Fri Jul  1 17:48:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (get2comp): revert all prior changes, and calculate
-	  proper 2's complement for negative numbers.  backported from
-	  HEAD.
-
-Fri Jul  1 15:50:12 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* missing/erf.c: need to include some headers for some platforms.
-
-	* win32/win32.h (copysign, scalb): define for compatibility with
-	  other platforms. [ruby-dev:26430]
-
-Fri Jul  1 15:37:42 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* missing/crypt.c: modified to make it compilable on platforms
-	  other than BSD.  [ruby-dev:26430]
-
-	* missing/erf.c: ditto.  code from <exp.c> merged.
-
-Fri Jul  1 12:44:56 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb (OpenURI.open_http): refine post_connection_check
-	  call.
-
-Fri Jul  1 11:34:08 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* missing/crypt.c: replaced with 4.4BSD version.
-
-	* missing/erf.c: ditto.
-
-	* missing/vsnprintf.c: removed the third provision from the old
-	  BSD license.  [ruby-core:05177]
-
-Fri Jul  1 01:45:21 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enum.c (enum_min, enum_max): must not return Qundef.
-	  fixed: [ruby-core:05299]
-
-Fri Jul  1 00:18:40 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/delegate.rb (Delegator::respond_to): respond_to? must check
-	  destination object.  [ruby-talk:146894]
-
-Thu Jun 30 19:00:21 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
-	* lib/irb/ruby-lex.rb (RubyLex::identify_number): alternative implements
-	  for [ruby-dev:26410]. And support a numeric form of 0d99999.
-
-Thu Jun 30 17:28:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/irb/ruby-lex.rb (RubyLex::identify_number): should not treat
-	  plain zero as an octal number.  [ruby-dev:26410]
-
-Thu Jun 30 15:13:16 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): pre-evaluate argument for unambiguous
-	  evaluation order.  [ruby-dev:26383]
-
-Thu Jun 30 09:53:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/delegate.rb (Delegator::method_missing): forward unknown
-	  method to the destination.  suggested by
-	  <christophe.poucet@gmail.com>.  [ruby-talk:146776]
-
-Tue Jun 28 21:59:29 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* dir.c, eval.c, hash.c, process.c, ruby.c: avoid warning "unused
-	  variable" [ruby-dev:26387]
-
-Sat Jun 25 17:15:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_query): should
-	  discard if key=val pair is empty. patch from Gary Wright.
-
-Sat Jun 25 23:30:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (detach_process_watcher): terminate process watcher
-	  thread right after rb_waitpid() succeed.  [ruby-talk:146430]
-
-Sat Jun 25 15:49:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enum.c (enum_min, enum_max): do not ignore nil as the first element.
-
-Sat Jun 25 14:40:17 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/sdbm/init.c (fsdbm_select): SDBM#select had returned the array
-	  which contained each elements twice. [ruby-dev:26358]
-
-Fri Jun 25 05:06:47 2005  Michael Neumann  <mneumann@ruby-lang.org>
-
-	* lib/xmlrpc/*, test/xmlrpc/*: backported changes from HEAD into 1.8
-
-Fri Jun 24 17:00:00 2005  Shigeo Kobayashi  <shigeo@tinyforest.jp>
-
-	* ext/bigdecimal/bigdecimal.c: patch from "NATORI Shin"
-	  (u-tokyo.ac.jp) applied to fix rounding bug.
-
-Fri Jun 24 13:06:45 2005  akira yamada  <akira@ruby-lang.org>
-
-	* lib/uri/common.rb, lib/uri/generic.rb: fixed typo in documents and
-	  replaced some existent domain name with "example.com".
-
-Fri Jun 24 12:23:19 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: fix typo on Tk.grid_propagate.
-
-	* ext/tk/lib/tk.rb: Tk.event_generate and TkWindow#event_generate
-	  accept TkEvent::Event object as context argument.
-
-	* ext/tk/lib/tk/event.rb: add TkEvent::Event#valid_fields and
-	  valid_for_generate to get field parameters of event_generate.
-
-Thu Jun 23 23:55:59 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* runruby.rb: should load built rbconfig.rb.
-
-Thu Jun 23 16:53:15 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/canvastag.rb: TkcGroup.new cannot include given items.
-	  TkcGroup#exclude calls wrong method.
-	  Add alias TkcGroup#add [ruby-talk:146049].
-
-	* ext/tk/lib/tk/canvas.rb: TkCanvas#dtag and some subcommands of
-	  TkCanvas#addtag fail to treat a TkcTag argument.
-
-	* ext/tk/lib/tk/event.rb: add TkEvent::Event#generate to help to send
-	  current event to other widgets.
-
-Mon Jun 20 18:44:04 2005  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): DUMMY_SETJMP is replaced
-	  because setjmp is not enough to fix getcontext and SPARC register
-	  window problem.
-
-Mon Jun 20 16:48:36 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/dbm/dbm.c (fdbm_closed): new method DBM#closed?
-
-	* ext/gdbm/gdbm.c (fgdbm_closed): new method GDBM#closed?
-
-	* ext/sdbm/init.c (fsdbm_closed): new method SDBM#closed?
-
-	* test/dbm/test_dbm.rb, test/gdbm/test_gdbm.rb, test/sdbm/test_sdbm.rb
-	  (teardown): close all db objects before deleting data files.
-
-	* win32/win32.{ch} (unlink): hook runtime function to change
-	  file attribute before unlinking.
-	  fixed: [ruby-dev:26360]
-
-Mon Jun 20 02:15:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (define_final): document fix: finalizers never get called
-	  before target object is destroyed.
-
-Mon Jun 20 01:26:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/openssl_missing.c, ext/openssl/ossl.h,
-	  ext/openssl/ossl_asn1.c, ext/openssl/ossl_bio.c,
-	  ext/openssl/ossl_pkcs12.h, ext/openssl/ossl_x509req.c: avoid
-	  compiler warnings. suggested by Michal Rokos.
-
-Sun Jun 19 14:09:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (run_final): reduce unnecessary object allocation during
-	  finalization.
-
-	* gc.c (rb_gc_call_finalizer_at_exit): deferred finalizers list should
-	  be cleared before calling them.  fixed: [ruby-talk:145790]
-
-Fri Jun 17 13:01:40 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/time.rb (Time.parse): fix previous leap seconds support.
-	  (Time.rfc2822): ditto.
-	  (Time.xmlschema): ditto.
-
-Thu Jun 16 15:06:55 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/tcltklib/tcltklib.c (ip_rb_threadVwaitCommand): Tcl_Release
-	  was missing.
-
-Thu Jun 16 13:34:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: add Tk.getMultiple{Open|Save}File() which return
-	  an Array of selected files.
-
-Thu Jun 16 12:53:24 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/time.rb (Time.parse): "Fri Jan  1 08:59:60 +0900 1999" was
-	  parsed as "Fri Jan 01 09:00:00 JST 1999" even on an environment
-	  which supports leap seconds.
-	  (Time.rfc2822): ditto.
-	  (Time.xmlschema): ditto.
-
-Thu Jun 16 08:29:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/dl/sym.c (rb_dlsym_call): needs FREE_ARGS before return.
-	  fixed memory leak. [ruby-Bugs-2034]
-
-Wed Jun 15 18:26:39 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: support "tk inactive" sub-command [for Tcl/Tk8.5a3]
-
-	* ext/tk/lib/tk/namespace.rb: support "namespace path" sub-command and
-	  'namespace ensemble' sub-command [for Tcl/Tk8.5a3]
-
-Tue Jun 14 02:02:43 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tkutil.c: add TkUtil::CallbackSubst.subst_arg(m, ...) &
-	  _define_attribute_aliases(hash) to get substitution-argument from
-	  attributes (e.g. subst_arg(:x,:y,:num,:button) --> "%x %y %b %b ").
-
-	* ext/tk/lib/tk/event.rb: use _define_attribute_aliases().
-
-Mon Jun 13 13:01:05 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* hash.c (ruby_setenv): fixed SEGV. [ruby-dev:26186]
-
-Mon Jun 13 01:54:20 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* signal.c (sigexit): call rb_thread_signal_exit() instead of
-	  rb_exit().  [ruby-dev:26347]
-
-	* eval.c (rb_thread_signal_exit): a new function to exit on main
-	  thread.
-
-	* eval.c (rb_thread_switch): exit status should be retrieved from
-	  ruby_errinfo.
-
-	* eval.c (rb_f_exit): ensure exit(0) should call
-	  exit(EXIT_SUCCESS).
-
-Mon Jun 13 01:20:02 2005  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (rb_gc_mark_threads): curr_thread may not be part of the
-	  thread list.  [ruby-dev:26312]
-
-Fri Jun 10 23:35:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* missing/mkdir.c: remove. [ruby-core:05177]
-
-Fri Jun 10 22:54:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* missing.h: fd_set stuffs need sys/types.h.  fixed: [ruby-core:05179]
-
-Thu Jun  9 23:58:12 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/Win32API/Win32API.c (Win32API_Call): disable global
-	  optimization. fixed: [ruby-core:05143]
-
-Thu Jun  9 23:35:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enum.c (enum_inject): default the result value to Qundef to use
-	  first element as initial value if not given.
-
-Thu Jun  9 19:55:41 2005  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (ruby_longjmp): new macro to call longjmp, setcontext, etc.
-	  (ruby_setjmp): new macro to call setjmp, getcontext, etc.
-	  (ruby_setjmp): call setjmp before getcontext to avoid IA64 register
-	  stack problem.
-	  [ruby-talk:144939]
-
-	* gc.c (Init_stack): remove IA64_MAGIC_STACK_LIMIT.
-
-Thu Jun  9 11:55:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/delegate.rb (SimpleDelegator::__setobj__): need check for
-	  recursive delegation.  [ruby-core:04940]
-
-Wed Jun  8 18:47:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-expr-beg): fix looking point drift.
-
-Wed Jun  8 11:11:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (get2comp): calculate proper 2's complement for
-	  negative numbers.  a bug in normalizing negative numbers
-	  reported from Honda Hiroki <hhonda@ipflex.com>.
-
-Wed Jun  8 08:33:10 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enum.c (enum_min_by, enum_max_by): return nil if no iteration.
-	  fixed: [ruby-dev:26245]
-
-	* eval.c (rb_need_block): ensure a block is given.
-
-	* eval.c (backtrace): skip successive frames sharing same node.
-
-Wed Jun  8 00:15:08 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (ruby_getaddrinfo__aix): merged a patch from
-	  KUBO Takehiro <kubo at jiubao.org> to support AIX.  [ruby-list:40832]
-
-Wed Jun  8 00:09:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/yaml/rubytypes.rb (Array::to_yaml): merged a patch from
-	  Tilman Sauerbeck <tilman at code-monkey.de>.  [ruby-core:05055]
-
-	* lib/yaml/rubytypes.rb (Hash::to_yaml): ditto.
-
-Wed Jun  8 00:00:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/curses/curses.c (curses_insertln): merged a patch from
-	  TAKAHASHI Tamotsu <ttakah at lapis.plala.or.jp>.  [ruby-ext:02305]
-
-Tue Jun  7 19:34:15 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/irb/init.rb (IRB::IRB.rc_file_generators): more flexible
-	  IRB.rc_file_generators.  [ruby-core:05163]
-
-Tue Jun  7 18:39:31 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/thread.rb: RDoc documentation from Eric Hodel
-	  <drbrain at segment7.net> added.  [ruby-core:05148]
-
-Tue Jun  7 18:30:04 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): add .SUFFIXES from depend file.
-	  fixed: [ruby-dev:26294]
-
-Tue Jun  7 17:39:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_mod_cvar_get): Module#class_variable_get(): back
-	  ported from CVS HEAD.  [ruby-talk:144741]
-
-	* object.c (rb_mod_cvar_set): Module#class_variable_set().
-	  [ruby-talk:144741]
-
-Tue Jun  7 16:32:53 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): raise exception on debug mode (-d),
-	  not verbose mode (-v/-w).  [ruby-core:05123]
-
-Tue Jun  7 10:30:49 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: slave-ip fails to call procedures
-	  delegated by master-ip.
-
-Sun Jun  5 23:00:35 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/console.rb: create console when required
-
-	* ext/tk/sample/tkextlib/tile/demo.rb: fix TypeError & create Console
-
-Sat Jun  4 14:55:18 2005  Tanaka Akira  <akr@m17n.org>
-
-	* test/dbm/test_dbm.rb: merged from ext/dbm/testdbm.rb.
-
-	* test/gdbm/test_gdbm.rb: merged from ext/gdbm/testgdbm.rb.
-
-	* test/sdbm/test_sdbm.rb: renamed from ext/sdbm/testsdbm.rb with
-	  modification to use test/unit.
-
-Fri Jun  3 14:06:12 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: fix typo.
-
-Wed Jun  1 11:32:42 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/Makefile.sub: can use single quote character in DESTDIR.
-	  [ruby-dev:26205]
-
-Mon May 30 23:48:29 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/macpkg.rb: add PACKAGE_NAME information of Tcl/Tk
-	  Extension.
-
-	* ext/tk/lib/tk/msgcat.rb: ditto.
-
-	* ext/tk/lib/tk/winpkg.rb: ditto.
-
-	* ext/tk/lib/tkextlib/*: ditto.
-
-Sat May 28 16:40:15 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* test/openssl/test_x509store.rb: add test for expired CRL
-	  and refine some assertions.
-
-Sat May 28 05:15:51 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_x509store.c (ossl_x509stctx_set_time): should
-	  not set internal flag directry.
-
-Sat May 28 02:00:11 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line):
-	  ENV["REQUEST_URI"] is better to get correct Request-URI
-	  than ENV["SCRIPT_NAME"] + ENV["PATH_INFO"].  [ruby-dev:26235]
-
-Fri May 27 16:32:04 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/mkmf.rb: use the semicolon as the path separator
-	  in the environment of MSYS.  fixed: [ruby-dev:26232]
-
-Thu May 26 06:08:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: add shortcut-methods of tk_call + tk_split_list
-
-Wed May 25 22:52:42 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/irb/input-method.rb: do not use Readline::HISTORY.pop.
-	  (backported from HEAD)
-
-Wed May 25 21:55:40 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* ext/readline/readline.c: supported libedit. (backported from HEAD)
-
-	* ext/readline/extconf.rb: ditto.
-
-	* test/readline/test_readline.rb: ditto.
-
-Wed May 25 20:06:27 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: TkComm#tk_split_*list fail to split a kind of SJIS
-	  strings. To avoid the trouble, add arguments to control converting
-	  encoding, and do split on a UTF8 string.
-
-	* ext/tk/lib/multi-tk.rb: modify to attend encoding.
-
-	* ext/tk/lib/remote-tk.rb: ditto.
-
-	* ext/tk/lib/tk/itemconfig.rb: ditto.
-
-	* ext/tk/lib/tk/listbox.rb: ditto.
-
-	* ext/tk/lib/tk/namespace.rb: ditto.
-
-	* ext/tk/lib/tk/panedwindow.rb: ditto.
-
-	* ext/tk/lib/tk/text.rb: ditto.
-
-	* ext/tk/lib/tk/textmark.rb: ditto.
-
-	* ext/tk/lib/tk/texttag.rb: ditto.
-
-	* ext/tk/lib/tk/variable.rb: ditto.
-
-	* ext/tk/lib/tk/winfo.rb: ditto.
-
-	* ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb: ditto.
-
-	* ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: ditto.
-
-	* ext/tk/lib/tk.rb: add TkWindow#lower_window/raise_window and
-	  Tk#lower_window/raise_window by reason of method-name conflict
-
-	* ext/tk/lib/tk/canvas.rb: bug fix on TkCanvas#delete when given
-	  non-TkcItem arguments.
-
-	* ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto.
-
-Wed May 25 12:59:48 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb (OpenURI::Meta::RE_QUOTED_STRING): a content of
-	  quoted-string should be zero or more characters.
-
-Tue May 24 23:42:16 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (fix_pow): support Fixnum ** Float case directly
-	  without coercing.  [ruby-talk:142697] [ruby-talk:143054]
-
-Tue May 24 16:57:24 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.c (require_libraries): caused SEGV when continuation jumped
-	  in to the required library code.
-
-Tue May 24 11:56:25 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/getopts.rb: should warn only if verbose mode.
-	  fixed: [ruby-dev:26201]
-
-Tue May 24 06:45:31 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): string
-	  literals to be matched non-greedy.
-
-Tue May 24 00:34:32 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/soap/calc: method name 'set' was able to crash with a class Set.
-	  [ruby-dev:26210]
-
-	* test/wsdl/document/test_rpc.rb: dateTime comparison failed under
-	  TZ=right/Asia/Tokyo (with leap second.) [ruby-dev:26208]
-
-Mon May 23 16:24:05 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/extconf.rb: Framework support on MacOS X Tiger.
-
-	* ext/tcltklib/README.1st: add description of Framework support options.
-
-Mon May 23 12:21:37 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (make_regexp): should not return junk address during
-	  compile time.  [ruby-dev:26206]
-
-Sun May 22 21:54:06 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.4.
-
-	  == SOAP client and server ==
-
-	  === for both client side and server side ===
-
-	  * improved document/literal service support.
-	    style(rpc,document)/use(encoding, literal) combination are all
-	    supported.  for the detail about combination, see
-	    test/soap/test_style.rb.
-
-	  * let WSDLEncodedRegistry#soap2obj map SOAP/OM to Ruby according to
-	    WSDL as well as obj2soap.  closes #70.
-
-	  * let SOAP::Mapping::Object handle XML attribute for doc/lit service.
-	    you can set/get XML attribute via accessor methods which as a name
-	    'xmlattr_' prefixed (<foo name="bar"/> -> Foo#xmlattr_name).
-
-	  === client side ===
-
-	  * WSDLDriver capitalized name operation bug fixed.  from
-	    1.5.3-ruby1.8.2, operation which has capitalized name (such as
-	    KeywordSearchRequest in AWS) is defined as a method having
-	    uncapitalized name. (converted with GenSupport.safemethodname
-	    to handle operation name 'foo-bar').  it introduced serious
-	    incompatibility; in the past, it was defined as a capitalized.
-	    define capitalized method as well under that circumstance.
-
-	  * added new factory interface 'WSDLDriverFactory#create_rpc_driver'
-	    to create RPC::Driver, not WSDLDriver (RPC::Driver and WSDLDriver
-	    are merged).  'WSDLDriverFactory#create_driver' still creates
-	    WSDLDriver for compatibility but it warns that the method is
-	    deprecated.  please use create_rpc_driver instead of create_driver.
-
-	  * allow to use an URI object as an endpoint_url even with net/http,
-	    not http-access2.
-
-	  === server side ===
-
-	  * added mod_ruby support to SOAP::CGIStub.  rename a CGI script
-	    server.cgi to server.rb and let mod_ruby's RubyHandler handles the
-	    script.  CGIStub detects if it's running under mod_ruby environment
-	    or not.
-
-	  * added fcgi support to SOAP::CGIStub.  see the sample at
-	    sample/soap/calc/server.fcgi.  (almost same as server.cgi but has
-	    fcgi handler at the bottom.)
-
-	  * allow to return a SOAPFault object to respond customized SOAP fault.
-
-	  * added the interface 'generate_explicit_type' for server side
-	    (CGIStub, HTTPServer).  call 'self.generate_explicit_type = true'
-	    if you want to return simplified XML even if it's rpc/encoded
-	    service.
-
-	  == WSDL ==
-
-	  === WSDL definition ===
-
-	  * improved XML Schema support such as extension, restriction,
-	    simpleType, complexType + simpleContent, ref, length, import,
-	    include.
-
-	  * reduced "unknown element/attribute" warnings (warn only 1 time for
-	    each QName).
-
-	  * importing XSD file at schemaLocation with xsd:import.
-
-	  === code generation from WSDL ===
-
-	  * generator crashed when there's '-' in defined element/attribute
-	    name.
-
-	  * added ApacheMap WSDL definition.
-
-	* sample/{soap,wsdl}: removed.
-
-Sun May 22 19:11:35 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#intialize):
-	  should initialize session id context. [ruby-core:4663]
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): add session id support.
-
-Sat May 21 10:24:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/Makefile.sub: tds files were not deleted when DESTDIR
-	  included '\' path delimiter. [ruby-dev:26193]
-
-Thu May 19 19:04:29 2005  speakillof  <speakillof@yahoo.co.jp>
-
-	* lib/rexml/encodings/SHIFT-JIS.rb: encoding and decoding were
-	  swapped. [ruby-core:4772]
-
-Wed May 18 23:42:25 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (exc_exception): reverted to call Exception#initialize
-	  directly.  fixed: [ruby-dev:26177]
-
-Wed May 18 23:39:09 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (glob_helper): get rid of using String.  [ruby-dev:26180]
-
-	* dir.c (push_braces): should skip balanced braces.
-
-	* eval.c (ruby_options), win32/win32.c (NtInitialize): move argument
-	  intialization back.  [ruby-dev:26180]
-
-Tue May 17 15:31:31 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should
-	  break the loop if the socket reached to EOF. [ruby-talk:142285]
-
-Tue May 17 11:52:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (unixtime_to_filetime): use localtime() instead of
-	  gmtime() when using FileLocalTimeToFileTime().
-
-Mon May 16 22:28:43 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.h, {bcc32,win32,wince}/Makefile.sub: moved rb_[ugp]id_t
-	  to get rid of redefinition warnings on mingw.
-
-	* class.c (rb_class_init_copy): singleton class is disallowed to copy,
-	  from its definition.  fixed: [ruby-talk:142749]
-
-Mon May 16 08:52:29 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.{h,c}: define rb_[pgu]id_t.
-
-Mon May 16 00:21:02 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb (Pathname#unlink): use SystemCallError instead of
-	  Errno::EISDIR because EISDIR is not portable.
-	  [ruby-core:5001]
-
-Sun May 15 22:11:33 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb (DRbObject#method_missing): use raise(exception).
-	  [ruby-dev:26164]
-
-Sun May 15 18:56:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in, ruby.h: define rb_[pgu]id_t macros instead of typedefs
-	  to get rid of types which might not be defined yet.  [ruby-dev:26165]
-
-Sun May 15 14:35:46 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb (Pathname#unlink): unlink a symlink to a directory
-	  was failed.  [ruby-core:4992]
-
-Sun May 15 09:57:30 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (unixtime_to_filetime): deal with DST.
-	  [ruby-talk:141817]
-
-Sat May 14 23:59:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (exc_exception, {exit,name_err,syserr}_initialize): call
-	  Execption#initialize.  fixed: [ruby-talk:142593]
-
-Sat May 14 23:57:26 2005  Erik Huelsmann  <ehuels@gmail.com>
-
-	* configure.in: Check for the availability of pid_t, gid_t and uid_t and
-	  remove AC_TYPE_UID_T.  fixed: [ruby-core:04745]
-
-	* defines.h: Remove pid_t typedef.
-
-	* ruby.h: Define rb_pid_t, rb_gid_t and rb_uid_t in accordance with
-	 the available system types.
-
-	* process.c: Change instances of pid_t and gid_t to their rb_*
-	 counterparts.
-
-	* ext/pty/pty.c: Change pid_t to rb_pid_t.
-
-	* vms/config.h: Define HAVE_{P,G,U}ID_T to 1.
-
-	* win32/Makefile.sub: Remove #define for {g,u}id_t.
-
-	* win32/win32.c: Change pid_t to rb_pid_t.
-
-	* wince/Makefile.sub: Remove #define for {g,u}id_t.
-
-	* wince/sys/types.h: Remove definitions of {p,g,u}id_t.
-
-Fri May 13 23:44:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: keep srcdir unexpanded.
-
-	* lib/mkmf.rb (create_makefile): quote topdir and hdrdir if necessary.
-	  fixed: [ruby-core:04932]
-
-	* lib/mkmf.rb (configuration), {bcc32,win32,wince}/Makefile.sub: make
-	  also INSTALL_PROG and INSTALL_DATA system dependent.
-	  fixed: [ruby-core:04931]
-
-Fri May 13 17:54:39 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* variable.c (generic_ivar_get): rb_attr_get should not warn.
-	  [ruby-dev:26010]
-
-Fri May 13 12:28:43 2005  Daniel Berger  <djberge@qwest.com>
-
-	* array.c (rb_ary_select): can remove argc check. [ruby-core:4911]
-
-	* test/ruby/test_array.rb: add test for find_all.
-
-Fri May 13 11:29:00 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* eval.c (unknown_node): add volatile directive to prototype.
-
-Thu May 12 17:08:48 2005  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (rb_io_eof, remain_size, read_all, io_read, appendline)
-	  (swallow, rb_io_each_byte, rb_io_getc): revert previous change.
-
-	* io.c (rb_io_eof, io_fread, appendline, swallow, rb_io_each_byte)
-	  (rb_io_getc, rb_getc): call clearerr before getc to avoid
-	  stdio incompatibility.
-
-Thu May 12 16:52:20 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/rdoc/parsers/parse_c.rb: more readability for mixing
-	  progress "c..." and warning message.
-
-Thu May 12 16:31:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: follow nkf 2.0.5
-
-Thu May 12 16:15:01 2005  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (rb_io_eof, remain_size, read_all, io_read, appendline)
-	  (swallow, rb_io_each_byte, rb_io_getc): don't rely EOF flag.
-	  [ruby-talk:141527]
-
-Thu May 12 15:56:20 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
-
-	* lib/rdoc/parsers/parse_c.rb: show parsing progress for C files.
-	  [ruby-core:4341]
-
-Thu May 12 13:47:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* test/drb/test_drb{ssl,unix}.rb: can test drb
-	  before install. (backported from HEAD) [ruby-dev:26146]
-
-Thu May 12 09:53:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* version.c (ruby_show_version): flush for non-tty stdout.
-
-Thu May 12 09:07:07 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* test/ruby/envutil.rb, test/drb/drbtest.rb: can test drb
-	  before install. (backported from HEAD) [ruby-Bugs-1672]
-
-Thu May 12 01:23:55 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_eval), parse.y (arg): reduce fixnum range literal at
-	  parser.  fixed: [ruby-dev:26113]
-
-	* eval.c (unknown_node): ignore broken NODE to get rid of accessing
-	  possibly inaccessible address.  fixed: [ruby-dev:26122]
-	  should emit more useful information like [ruby-dev:26126], though.
-
-Wed May 11 16:20:01 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/cgi.rb: new methods WEBrick::CGI#[], WEBrick::CGI#logger
-	  and WEBrick::CGI#config. (backported from HEAD)
-
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape_path): should
-	  not use String#split("/"). (backported from HEAD)
-
-Wed May 11 15:58:39 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (break_jump): break should not cross functions.
-	  [ruby-list:40818]
-
-Wed May 11 10:39:37 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/tempfile.rb (Tempfile#unlink): fixed typo.
-
-Wed May 11 01:03:36 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (TMP_ALLOC): use macro NEW_NODE() to get rid of warnings on
-	  platforms which have no alloca().  fixed: [ruby-talk:141301]
-
-Sun May  8 23:17:47 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/timer.rb: fix typo.
-
-Sun May  8 16:52:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/profiler.rb: fixed "undefined method `[]' for nil:NilClass"
-	  [ruby-core:4775] [ruby-talk:140401] [ruby-dev:26118]
-
-Sat May  7 22:58:00 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (have_var): no libs argument is given.
-
-Sun May  1 09:58:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (process_sflag): replace '-' in variable names with '_'.
-	  [ruby-dev:26107]
-
-	* ruby.c (set_arg0): use also environment variable space for setting
-	  $0.  [ruby-core:04774]
-
-Wed Apr 27 23:42:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/Makefile.sub (OPTFLAGS): default global optimization to
-	  disabled only for VC++6.
-
-Tue Apr 26 22:58:00 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c (ip_invoke_core): call Tcl's "::unknown"
-	  command when can't get information of target command.
-
-Mon Apr 25 01:18:43 2005  Tanaka Akira  <akr@m17n.org>
-
-	* regex.c: declare rb_warn to have variadic argument.  [ruby-core:4751]
-
-Sat Apr 23 19:45:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/tcltklib/tcltklib.c (ip_RubyExitCommand): exit with status code
-	  via TclTkIp#_eval didn't work. [ruby-talk:139390]
-
-Fri Apr 22 16:41:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/tcltklib/tcltklib.c (ip_set_exc_message): fixed memory leak.
-
-	* ext/tcltklib/tcltklib.c: eTkCallbackReturn was not initialized.
-
-Thu Apr 21 00:07:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): support platforms have file separator
-	  other than /.
-
-	* {bcc32,win32,wince}/Makefile.sub (BUILD_FILE_SEPARATOR): separator
-	  of building platform.
-
-	* {bcc32,win32,wince}/Makefile.sub (CP, INSTALL): use COPY command.
-
-Wed Apr 20 23:22:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in, common.mk: miniruby depens on MINIOBJS.
-
-	* dmydln.c (dln_load): dummy function to raise LoadError.
-
-	* cygwin/GNUmakefile.in, {bcc32,win32,wince}/Makefile.sub: miniruby
-	  can't load extensions on Windows.
-
-Wed Apr 20 23:01:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/ifchange.bat: delete testing files.
-
-Wed Apr 20 07:27:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* {bcc32,win32,wince}/configure.bat, {bcc32,win32,wince}/setup.mak:
-	  add extout option.
-
-	* bcc32/setup.mak: make configuration variables overridable.
-
-Wed Apr 20 04:15:27 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
-
-	* lib/irb.rb lib/irb/* doc/irb: IRB 0.9.5
-
-Tue Apr 19 23:37:09 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/ftools.rb (File.safe_unlink): do not modify a symlinked file.
-
-Tue Apr 19 00:06:20 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: expand path for ext/**/extconf.rb.
-
-Mon Apr 18 11:25:14 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/zlib/zlib.c (zstream_run): fixed SEGV. [ruby-core:4712]
-
-Sun Apr 17 23:57:49 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (extmake, parse_args): do not expand destdir.
-
-	* ext/extmk.rb (relative_from): treat mere drive letter as an absolute
-	  path.
-
-Sat Apr 16 17:01:16 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* sample/rss/tdiary_plugin/rss-recent.rb (rss_recent_cache_rss):
-	  use the first date information of items as site date information
-	  if channel doesn't have date information.
-
-Sat Apr 16 15:27:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_PROG_INSTALL): not add -p option to INSTALL.
-	  files need timestamps to be kept are only ar-archive on a few
-	  platforms, and be installed by instruby.rb but not INSTALL.
-	  fixed: [ruby-core:04721]
-
-	* mkconfig.rb: purge autoconf value variables.
-
-Sat Apr 16 10:36:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/Makefile.sub: quick hack... prepend DESTDIR.
-	  still have restriction on DESTDIR ("", "/", "e:")
-
-Sat Apr 16 03:59:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: check for OPENSSL_cleanse.
-
-	* ext/openssl/openssl_missing.h: ditto.
-
-Thu Apr 14 19:18:30 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (remove_file): ignore exceptions caused by
-	  chmod.
-
-	* lib/fileutils.rb (remove_dir): try to get rights to rmdir.
-	  [ruby-Bugs:1502] (2 items backportted from HEAD, rev 1.53-54)
-
-Thu Apr 14 16:57:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bcc32/Makefile.sub: failed to remove debug information files.
-	  fixed: [ruby-dev:26034]
-
-Wed Apr 13 23:40:21 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (RSS::VERSION): 0.1.3 -> 0.1.4.
-
-	* lib/rss/rss.rb (RSS::Element#converter): fixed converter
-	  transmission bug.
-
-Wed Apr 13 21:20:35 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (mingw32): extract msvcr*.dll from objdump result.
-
-Wed Apr 13 20:24:30 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (mingw32): use actual runtime DLL name as ruby DLL
-	  name and default load path.
-
-	* win32/Makefile.sub, win32/setup.mak: ditto.
-
-Tue Apr 12 15:33:09 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c (ip_finalize): better modification than the
-	  previous commit [ruby-dev:26029].
-
-Tue Apr 12 12:38:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c (ip_finalize): fix SEGV when Tcl_GlobalEval()
-	  modifies the argument string to eval.
-
-Tue Apr 12 02:21:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c (ip_finalize): add existence check of
-	  Tcl commands before calling Tcl_GlobalEval().
-
-Mon Apr 11 23:47:21 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb: [druby-ja:123] fix: When reference of my object is
-	  loaded, the object is tainted.
-
-	* test/drb/test_drb.rb: ditto.
-
-Mon Apr 11 22:18:23 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* dir.c, file.c (lstat): avoid warnings for mingw.
-
-Mon Apr 11 20:11:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c (ip_finalize): adhoc patch to avoid SEGV
-	  when exit on Tcl/Tk8.3.x.
-
-Mon Apr 11 15:26:25 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb (configuration): shouldn't output hdrdir twice.
-
-Mon Apr 11 12:09:05 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* {bcc32,win32,wince}/Makefile.sub: ri data was not installed
-	  into correct path. [ruby-dev:26011]
-
-	* bcc32/Makefile.sub: defaulted install-nodoc. [ruby-dev:26011]
-
-Sun Apr 10 10:12:42 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c(ole_invoke): retry after converting Qnil
-	  to VT_EMPTY.
-
-	* ext/win32ole/win32ole/tests/testWIN32OLE.rb: correct error
-	  message string "Unknown" => "unknown".
-
-Sat Apr  9 18:20:31 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/image.rb: support to create TkImage object without
-	  creating a new image object on Tk.
-
-	* ext/tk/lib/tk/menu.rb: use TkCommandNames on create_self()
-
-	* ext/tk/lib/tk/root.rb: TkRoot.to_eval() returns '.'.
-
-	* ext/tk/lib/tk/text.rb: add methods to create a TkText::IndexString
-	  from (x, y) coords.
-
-	* ext/tk/lib/tkextlib/tile/: add demo and update support status.
-
-Sat Apr  9 14:42:29 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* sample/rss/tdiary_plugin/rss-recent.rb: supported configuration
-	  via Web browser.
-
-Sat Apr  9 11:59:57 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss: backoported from HEAD.
-
-	* lib/rss: refactored.
-	  - gave a name to 'x'.
-	  - undef_method -> remove_method for avoiding a warning in ruby 1.6.
-
-
-	* lib/rss/parser.rb: @@setter -> @@setters.
-
-	* lib/rss/parser.rb
-	  (RSS::BaseListener.register_uri)
-	  (RSS::BaseListener.uri_registered?)
-	  (RSS::BaseListener.install_get_text_element):
-	  swapped the first argument and the second argument.
-
-	* lib/rss/taxonomy.rb: swapped the first argument and the second
-	  argument for RSS::BaseListener.install_get_text_element.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/parser.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/content.rb: ditto.
-
-	* lib/rss/parser.rb
-	  (RSS::BaseListener.install_setter)
-	  (RSS::BaseListener.register_uri): changed fallback way.
-
-	* lib/rss/parser.rb: added class name registry for complex model
-	  elements. (ex. have childlen elements, have some attributes and
-	  a child element and so on.)
-
-
-	* lib/rss/dublincore.rb: supported multiple Dublin Core items.
-	* lib/rss/maker/dublincore.rb: ditto.
-
-	* lib/rss/maker/image.rb: supproted new Dublin Core API.
-
-
-	* lib/rss/maker/base.rb: added default current_element implementation.
-
-
-	* lib/rss/trackback.rb (RSS::TrackBackUtils.new_with_value_if_need):
-	  moved to RSS::Utils.
-
-	* lib/rss/utils.rb (RSS::Utils.new_with_value_if_need):
-	  moved from RSS::TrackBackUtils.
-
-
-	* lib/rss/maker/image.rb: fixed invalid argument of
-	  add_need_initialize_variable bug.
-	* lib/rss/maker/trackback.rb: ditto.
-
-
-	* lib/rss/rss.rb (Hash#merge): added for ruby 1.6.
-
-	* lib/rss/rss.rb (RSS::BaseModel.date_writer): changed to accept nil
-	  for date value.
-
-
-	* test/test_dublincore.rb: added tests for plural accessor and
-	  multiple Dublin Core items.
-
-	* test/test_setup_maker_1.0.rb: fixed swapped actual and expected
-	  values.
-
-	* test/rss/rss-assertions.rb (assert_multiple_dublin_core): added
-	  an assertion for testing multiple Dublin Core items.
-
-	* test/rss/test_maker_dc.rb (test_rss10_multiple): added a test
-	  for making multiple Dublin Core items.
-
-	* test/rss/test_maker_dc.rb (test_date): added a test for #date=
-	  and #dc_date=.
-
-
-	* sample/rss/tdiary_plugin/rss-recent.rb:
-	  new option: @options['rss-recent.use-image-link']:
-	  use image as link instread of text if available.
-
-	* sample/rss/tdiary_plugin/rss-recent.rb (RSS_RECENT_VERSION):
-	  0.0.5 -> 0.0.6.
-
-Fri Apr  8 20:17:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (extmake): hdrdir needs to be defined also in
-	  Config::CONFIG.
-
-	* lib/mkmf.rb (configuration, create_makefile): get rid of recursive
-	  macro reference.
-
-Fri Apr  8 18:26:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ssl.c: add callbacks to OpenSSL::SSL::SSLContexts.
-	  - SSLContext#client_cert_cb=(aProc). it is called when a client
-	    certificate is requested by a server and no certificate was not
-	    set for the SSLContext. it must return an Array which includes
-	    OpenSSL::X509::Certificate and OpenSSL::PKey::RSA/DSA objects.
-	  - SSLContext#tmp_dh_callback=(aProc). it is called in key
-	    exchange with DH algorithm. it must return an OpenSSL::PKey::DH
-	    object.
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_set_ciphers): ignore the
-	  argument if it's nil.
-
-	* ext/openssl/ossl_pkey.c
-	  (GetPrivPKeyPtr, ossl_pkey_sign): should call rb_funcall first.
-	  (DupPrivPKeyPtr): new function.
-
-	* ext/openssl/ossl_pkey_dh.c: add default DH parameters.
-
-	* ext/openssl/ossl_pkey.h: ditto.
-
-Fri Apr  8 01:55:20 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/sample/demos-{en,jp}/goldberg.rb: reduced window size.
-	  [ruby-dev:25992]
-
-Thu Apr  7 23:58:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (extmake): keep directory names in Makefile as macros.
-
-	* lib/mkmf.rb (configuration, create_makefile): ditto.
-
-	* lib/mkmf.rb (CXX_EXT): separate C++ extensions.
-
-Thu Apr  7 17:43:25 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* eval.c (rb_call0): "return" event hook should be always executed
-	  if event_hooks is set.  fixed: [ruby-core:04662]
-	  (backported from HEAD)
-
-Mon Apr  4 23:17:52 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb (TkComm#array2tk_list): accept enc-mode argument to
-	  decide whether convert encoding of each element or not.
-
-	* ext/tk/lib/tk/variable.rb (TkVariable#value=): fail to convert the
-	  encoding of array elements when assign an array to an TkVariable
-	  object.
-
-Mon Apr  4 10:26:48 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/tk/lib/tk/dialog.rb: fixed typo.
-
-Sun Apr  3 17:16:33 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.{h,c} (rb_w32_fdopen): avoid warning on bcc32.
-	  (backported from HEAD)
-
-Sat Apr  2 23:38:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (CP, INSTALL): get rid of less portable options.
-
-	* lib/mkmf.rb (configuration, create_makefile): correct configuration
-	  variable.
-
-	* {bcc32,win32,wince}/{Makefile.sub,setup.mak}: leave prefix empty in
-	  config.status for backward compatibility.  fixed: [ruby-core:04649]
-
-	* lib/mkmf.rb (create_makefile): ensure library directories get made
-	  before copying libraries there.
-
-Sat Apr  2 16:59:46 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: forgot to update RELEASE_DATE
-
-	* ext/tk/lib/tk/variable.rb: fix namespace trouble when autoloading
-
-	* ext/tk/lib/tk/palette.rb: define Tcl variable 'tkPalette' as global
-
-	* ext/tk/lib/tk/dialog.rb: use array2tk_list method when calling
-	  Tk.ip_eval.
-
-	* ext/tk/lib/tk/autoload.rb: add autoload entry 'TkDialogObj' and
-	  'TkWarningObj'
-
-Sat Apr  2 02:19:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb (TkWindow.initialize): accept 'without_creating'
-	  option without 'widgetname' option to allow creating a widget object
-	  which is used as an argument of Tcl/Tk's widget allocation commands.
-
-	* ext/tk/lib/tk/image.rb (TkImage.initialize): accept 'imagename'
-	  option to create a image object by the given name.
-
-Thu Mar 31 22:23:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (SRC_EXT): exclude just case different suffixes on case
-	  insensitive file system platforms.
-
-	* README.EXT, README.EXT.ja (Appendix C): utility functions.
-
-Thu Mar 31 14:15:44 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_engine.c (ossl_engine_s_load): should return
-	  value. [ruby-dev:25971]
-
-Thu Mar 31 08:25:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (RUBYOPT): clear for the environment RubyGems installed.
-
-	* common.mk (clean-local): keep $(PREP) files till distclean.
-
-	* common.mk (check): do all tests.
-
-Thu Mar 31 06:00:20 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_engine.c (ossl_engine_s_load): should not raise
-	  error even if the specified engine could not be loaded. (Dynamic
-	  engines don't have fixed name to load.)
-
-Thu Mar 31 00:18:27 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/ifchange.bat, win32/rm.bat: backported from HEAD.
-
-Wed Mar 30 23:44:50 2005  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* Makefile.in, */Makefile.sub, */configure.bat,
-	  cygwin/GNUmakefile.in, common.mk, configure.in, ext/extmk.rb,
-	  lib/mkmf.rb, instruby.rb, runruby.rb: backport extout.
-	  [ruby-dev:25963]
-
-Wed Mar 30 17:41:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: add TclTkIp#_create_console() method to
-	  create a Tcl/Tk's console window.
-
-	* ext/tk/lib/multi-tk.rb: support TclTkIp#_create_console() method.
-
-	* ext/tk/lib/remote-tk.rb: ditto.
-
-	* ext/tk/lib/tk/console.rb: ditto.
-
-	* ext/tk/lib/tk.rb: update RELEASE_DATE
-
-	* ext/tk/sample/demo-*/check2.rb: use 'return' in the Proc object.
-
-	* ext/tk/sample/tkextlib/**: ditto.
-
-Tue Mar 29 22:11:56 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* test/rinda/test_rinda.rb: use DRbObject.new_with instead of reinit.
-	  [ruby-dev:25961]
-
-Mon Mar 28 23:40:40 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb: move method DRbObject#reinit to DRbObject.new_with.
-	  extract method DRbObject.prepare_backtrace. add DRb.regist_server,
-	  remove_server, fetch_server. change server in thread variable if
-	  in-proc server. [druby-ja:113]
-
-	* lib/drb/gw.rb: ditto.
-
-Mon Mar 28 20:43:34 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/syck/rubyext.c: get rid of warnings caused by a bug of VC.
-
-Mon Mar 28 08:39:49 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (iconv_create): Iconv::Failure requires 3
-	  arguments.  (pointed out by NaHi)
-
-Sat Mar 26 22:51:33 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb (_callback_entry_class?): add for checking whether
-	  a class is available for a callback entry.
-
-	* ext/tk/lib/tk.rb (after_cancel): add Tk.after_cancel(afterID) method.
-
-	* ext/tk/lib/tk.rb (array2tk_list): change from private module method
-	  of TkComm to public module method.
-
-	* ext/tk/lib/tk.rb (cget): add check that slot argument is not
-	  empty string.
-
-	* ext/tk/lib/tk.rb (configinfo): ditto.
-
-	* ext/tk/lib/tk/itemconfig.rb (itemcget): add check that slot argument
-	  is not empty string.
-
-	* ext/tk/lib/tk/itemconfig.rb (itemconfiginfo): ditto.
-
-	* ext/tk/lib/tk/entry.rb: add TkEntry#icursor and icursor= (alias of
-	  cursor and cursor= method).
-
-	* ext/tk/lib/tk/font.rb: improve font treatment when the font name is
-	  empty string.
-
-	* ext/tk/lib/tk/variable.rb: add :variable, :window and :procedure
-	  type.
-
-	* ext/tk/lib/tk/variable.rb: improve treatment of array-type
-	  tkvariable.
-
-	* ext/tk/lib/tkextlib/blt.rb: add commands for zooming.
-
-	* ext/tk/lib/tkextlib/blt/*: bug fix.
-
-	* ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: bug fix and add methods
-	  to call TreeCtrl commands for bindings.
-
-	* ext/tk/sample/tkextlib/blt/*: new sample scripts.
-
-	* ext/tk/sample/tkextlib/treectrl/*: ditto.
-
-Fri Mar 25 10:53:16 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (WIN32_LEAN_AND_MEAN): removed because a lot of
-	  troubles.  [ruby-list:40721]
-
-Thu Mar 24 23:10:44 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (macro_defined?): try to compile for an old compiler
-	  which doesn't bail out at #error directive.  [ruby-dev:25818]
-
-	* lib/mkmf.rb (check_sizeof): refine logging messages.
-
-Thu Mar 24 03:57:48 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/utils.rb (WEBrick::Utils.create_listeners):
-	  - should raise ArgumentError if no port is specified.
-	  - even if the specified port is 0, all TCPServers should be
-	  initialized with the port given to the first one.
-
-	* lib/webrick/server.rb (WEBrick::GenericServer#initialize): if :Port
-	  parameter is 0, it should be updated with the port number which
-	  actually listened.
-
-Wed Mar 23 00:35:10 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* test/ruby/test_settracefunc.rb (test_event): added tests for
-	  "class" and "end" and "raise".
-
-Tue Mar 22 22:40:18 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* eval.c (rb_call0): check event_hooks instead of trace_func.
-
-Tue Mar 22 17:30:44 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* eval.c (rb_add_event_hook): new function to add a hook function for
-	  interpreter events. (backported form HEAD)
-
-Sun Mar 20 22:51:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (mkmf_failed): check if Makefile is created without
-	  create_makefile.
-
-Sat Mar 19 23:48:10 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-expr-beg): returned true always.
-	  fixed: [ruby-list:40683]
-
-Sat Mar 19 00:41:02 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/font.rb: add some TkFont class methods to get font
-	  information without creating a TkFont object.
-
-	* ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: bug fix and define some
-	  classes for components of Tk::TreeCtrl
-
-Thu Mar 17 17:42:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* struct.c (make_struct): allow non local-id field
-	  names. [ruby-core:04575]
-
-	* struct.c (inspect_struct): ditto.
-
-Wed Mar 16 23:36:02 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* eval.c (rb_call0): call_cfunc() should be protected.
-
-	* test/ruby/test_settracefunc.rb: added test for c-return.
-
-Wed Mar 16 22:20:25 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* object.c (str_to_id): fixed typo.
-
-Wed Mar 16 18:08:32 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call0): reorganize "return" event post.
-
-Tue Mar 15 23:49:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (Init_iconv): InvalidEncoding also should include
-	  Iconv::Failure.
-
-Tue Mar 15 16:38:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tkutil.c (ary2list): give wrong arguments to hash2kv()
-
-Mon Mar 14 19:39:33 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/timer.rb (TkTimer): forgot to clear @return_value
-	  when restarting
-
-	* ext/tk/lib/tk/sample/cd_timer.rb: new sample of TkRTTimer
-
-Mon Mar 14 12:21:03 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/timer.rb (TkRTTimer): forgot to reset the callback
-	  time. So, 'continue' do all callbacks between 'stop' and 'continue'.
-
-Mon Mar 14 08:14:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (str_to_id): warn for NUL containing strings.
-
-Mon Mar 14 00:13:49 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/timer.rb (TkRTTimer): correct calculation of offset
-	  value. get a little better accuracy.
-
-	* ext/tk/sample/demos-en/widget: use a binding with no local variables
-	  when eval a sample script.
-
-	* ext/tk/sample/demos-en/bind.rb: ditto.
-
-	* ext/tk/sample/demos-en/tcolor: ditto.
-
-	* ext/tk/sample/demos-jp/widget: ditto.
-
-	* ext/tk/sample/demos-jp/bind.rb: ditto.
-
-	* ext/tk/sample/demos-jp/tcolor: ditto.
-
-Sun Mar 13 10:04:17 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* test/rinda/test_rinda.rb: remove test_gc. [ruby-dev:25871]
-
-Thu Mar 10 19:12:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c (lib_eventloop_ensure): mis-delete a timer
-	  handler when exit from a recursive called eventloop
-
-	* ext/tk/lib/tk/timer.rb: new TkRTTimer class, which can works for a
-	  realtime operation
-
-	* ext/tk/sample/tkrttimer.rb: sample of TkRTTimer class
-
-	* ext/tk/lib/tk/textmark.rb: move  TkTextMark#+ and TkTextMark#- to
-	  TkText::IndexModMethods
-
-	* ext/tk/lib/tk/text.rb: improve TkTextMark#+ and TkTextMark#-, and
-	  add them to TkText::IndexModMethods module
-
-	* ext/tk/sample/tktextio.rb: add test part of "seek by text index
-	  modifiers"
-
-Thu Mar 10 08:10:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (make_regexp): need to free internal regexp structure when
-	  compilation fails.  [ruby-talk:133228]
-
-Wed Mar  9 20:25:58 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_write): call
-	  rb_sys_fail if errno isn't 0. [ruby-dev:25831]
-
-	* ext/openssl/lib/openssl/cipher.rb: fix typo. [ruby-dev:24285]
-
-Wed Mar  9 15:46:35 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/server.rb (WEBrick::GenericServer#start): should
-	  restore @token if accept failure. suggested by Dominique Brezinski.
-	  [ruby-core:04518]
-
-Wed Mar  9 13:37:57 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/sample/tktextio.rb: fix bug of handling 'end' position.
-	  support initial text, overwrite setting and pos_gravity control.
-
-Tue Mar  8 18:16:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/sample/tktextio.rb: New sample script. TkTextIO class in this
-	  sample supports to use a text widget as if it is a I/O stream (such
-	  like as StringIO class).
-
-Tue Mar  8 13:54:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/socket.c: workaround for some of 4.4BSD-Lite derived OSs.
-
-Tue Mar  8 12:36:17 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c: document from Sam Roberts
-	  <sroberts@uniserve.com> for getsockopt and setsockopt is merged.
-	  [ruby-doc:824]
-
-Tue Mar  8 01:27:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.66
-	  fixed: [ruby-dev:25828]
-
-Mon Mar  7 21:35:02 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* sample/webrick/httpsd.rb: fix typo in comment. suggested by
-	  Kazuhiko Shiozaki.
-
-Mon Mar  7 14:55:43 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (block_pass): should not push unique number if a block is
-	  not an orphan.  [ruby-dev:25808]
-
-Wed Feb 16 02:55:21 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_read,
-	  ossl_ssl_write):
-	  - need to set errno on Win32 platform.
-	  - should call rb_sys_fail instead of rasing SSLError if
-	    SSL_ERROR_SYSCALL occured.
-	  - should wait for that the underlying IO become readable or
-	    writable if the error was SSL_ERROR_WANT_READ or
-	    SSL_ERROR_WANT_WRITE. [ruby-dev:25795]
-
-	* ext/openssl/lib/openssl/buffering.rb
-	  (Buffering#initialize): should set @eof and @rbuffer.
-	  (Buffering#fill_rbuff): should rescue Errno::EAGAIN.
-	  (Buffering#consume_rbuf): pointless eof flag resetting is deleted.
-	  (Buffering#read): should return an empty string if the specified
-	  size is zero.
-	  (Buffering#readpartial): new method.
-	  (Buffering#readline): fix typo.
-	  (Buffering#getc): return the first character of string correctly.
-	  (Buffering#each): fix typo.  suggested by Brian Ollenberger.
-	  (Buffering#readchar): fix typo.
-	  (Buffering#eof?): should read again it the input buffer is empty.
-	  (Buffering#do_write): should rescue Errno::EAGAIN.
-	  (Buffering#puts): use "\n" as the output field separator.
-
-	* ext/openssl/lib/openssl/ssl.rb: set non-blocking flag to the
-	  underlying IO.
-
-	* ext/openssl/extconf.rb: get rid of GNUmakefile generation.
-
-	* text/openssl/test_pair.rb: test for IO like methods.
-
-	* test/ruby/ut_eof.rb: test about empty file.
-
-Mon Mar  7 10:22:06 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/un.rb: should use OptionParser. (backported form HEAD)
-
-Mon Mar  7 09:18:42 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_cmp_m): should not return false but nil.
-	  fixed: [ruby-dev:25811]
-
-Mon Mar  7 01:22:14 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tkutil.c: remove the some codes which depend on the
-	  difference between Ruby1.8 and 1.9, because st.c on Ruby1.9
-	  was changed.
-
-Mon Mar  7 00:01:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: fail to call TclTkLib.mainloop when $SAFE==4
-
-Sun Mar  6 16:41:33 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: HTTPHeader holds its header fields as an array
-	  (backport from CVS HEAD rev 1.112-1.123). [ruby-list:40629]
-
-	* test/net/http/test_httpheader.rb: new file.
-
-Sun Mar  6 11:47:10 2005  Sam Roberts  <sroberts@uniserve.com>
-
-	* lib/pp.rb: rdoced.  [ruby-core:4490]
-
-Sun Mar  6 11:36:37 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb (File::Stat#pretty_print): Etc.getpwuid and Etc.getgrgid
-	  may return nil.  [ruby-talk:129826]
-	  reported by Daniel Berger.
-
-Sat Mar  5 18:06:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c (fnmatch): removed unnecessary code. (ruby_1_8 didn't have
-	  String#clear, so [ruby-dev:24749] didn't affect it)
-
-	* win32/win32.c (NtInitialize): ditto. (by numeric.c 1.101.2.14)
-
-Sat Mar  5 16:29:26 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: freeze callback-entry objects
-
-	* ext/tk/lib/tkextlib/tile.rb: support tile-0.6
-
-Fri Mar  4 19:39:28 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#do_includes): replace
-	  also locally defined modules.
-
-	* ext/iconv/iconv.c: backport Iconv::InvalidEncoding from CVS HEAD.
-
-	* ext/strscan/strscan.c: moved misplaced rdoc.
-
-Fri Mar  4 15:58:12 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi-lib.rb: add deprecation warning. [ruby-dev:25499]
-	  getopts.rb, parsearg.rb, importenv.rb as well.
-
-Fri Mar  4 11:17:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c (ip_rbUpdateCommand): get rid of
-	  warnings with Tcl/Tk 8.3 or former (backport from CVS_HEAD).
-
-	* ext/tcltklib/tcltklib.c (ip_rb_threadUpdateCommand): ditto.
-
-Fri Mar  4 10:15:30 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/set.rb (SortedSet::setup): a hack to shut up warning.
-	  [ruby-talk:132866]
-
-Fri Mar  4 07:07:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.63
-
-Thu Mar  3 23:49:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.62
-
-Thu Mar  3 11:49:51 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* sample/rss/tdiary_plugin/rss-recent.rb: added site information.
-
-Wed Mar  2 19:53:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (parse_args): add DESTDIR only when not directed
-	  already.  fixed: [ruby-dev:25781]
-
-Wed Mar  2 17:14:18 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c (lib_eventloop_core): fix typo
-
-Wed Mar  2 16:00:02 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: enforce thread-check and exception-handling
-	  to avoid SEGV trouble.
-	  [KNOWN BUG] When supports pthread and running multiple Tk
-	  interpreters, an interrupt signal causes SEGV frequently. That
-	  may be a trouble of Ruby's signal handler.
-
-	* ext/tk/tkutil/tkutil.c; fix a bug on converting a SJIS string array
-	  to a Tcl's list string.
-
-	* ext/tk/tcltklib.c: wrap Tcl's original "namespace" command to
-	  protect from namespace crash.
-
-	* ext/tk/lib/multi-tk.rb: enforce exception-handling.
-
-	* ext/tk/lib/multi-tk.rb: catch IRB_EXIT to work on irb.
-
-	* ext/tk/lib/tk.rb: ditto.
-
-	* ext/tk/tcltklib.c: add TclTkLib.mainloop_thread?
-
-	* ext/tk/lib/multi-tk.rb: (bug fix) callback returns a value.
-
-	* ext/tk/lib/tk/canvas.rb (delete): bug fix when multiple arguments.
-
-	* ext/tk/lib/clock.rb: fix 'no method error'.
-
-	* ext/tk/lib/clock.rb (self.clicks): accept a Symbol argument.
-
-	* ext/tk/lib/variable.rb: be able to set default_value_type; :numeric,
-	  :bool, :string, :symbol, :list, :numlist or nil (default; same to
-	  :string). If set a type, TkVariable#value returns a value of the
-	  type.
-
-	* ext/tk/lib/tkextlib/tclx/tclx.rb: add Tk::TclX.signal to warn the
-	  risk of using TclX extension's 'signal' command.
-
-	* ext/tk/sample/irbtk.rb: irb with Ruby/Tk.
-
-	* ext/tk/sample/demos-*/anilabel.rb: bug fix on 'show code'
-
-	* ext/tk/sample/demos-*/aniwave.rb: new Ruby/Tk animation demo.
-
-	* ext/tk/sample/demos-*/pendulum.rb: ditto.
-
-	* ext/tk/sample/demos-*/goldberg.rb: ditto.
-
-	* ext/tk/sample/demos-*/widget: add entries of animation demos.
-
-Tue Mar  1 00:47:43 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* test/rinda/test_rinda.rb: backport from CVS_HEAD. use
-	  MockClock.sleep instead of Kernel.sleep [ruby-dev:25387]
-
-Tue Mar  1 00:34:24 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/tuplespace.rb (Rinda::TupleSpace): improved keeper thread.
-
-	* test/rinda/test_rinda.rb: ditto.
-
-Mon Feb 28 11:42:23 2005  Ian Macdonald  <ian@caliban.org>
-
-	* exception error messages updated.  [ruby-core:04497]
-
-Mon Feb 28 09:03:09 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (Init_socket): add bunch of Socket
-	  constants.  Patch from Sam Roberts <sroberts@uniserve.com>.
-	  [ruby-core:04409]
-
-Wed Feb 23 15:04:32 2005  akira yamada  <akira@ruby-lang.org>
-
-	* lib/uri/generic.rb (split_userinfo): should split ":pass" into ""
-	  and "pass".  [ruby-dev:25667]
-
-Wed Feb 23 08:00:18 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_s_create): no need for negative argc check.
-	  [ruby-core:04463]
-
-	* array.c (rb_ary_unshift_m): ditto.
-
-Wed Feb 23 01:57:46 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (initialize): handle certs correctly. Thanks,
-	  NABEYA Kenichi. (backported from CVS HEAD)
-
-Tue Feb 22 07:25:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_yylex): identfier after dot must not be a variable.
-
-Mon Feb 21 10:04:49 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* {bcc32,win32,wince}/Makefile.sub (config.h): add fcntl.
-
-	* win32/win32.[ch] (fcntl): ditto.
-
-	* win32/win32.c (rb_w32_connect): support nonblocking mode.
-
-	* ext/socket/socket.c (wait_connectable, ruby_connect): support
-	  nonblocking connect on various platforms.
-	  all changes are backported from CVS HEAD. [ruby-core:3154],
-	  [ruby-core:4364].
-
-Sun Feb 20 00:48:48 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb (URI::FTP#buffer_open): access mechanism
-	  re-implemented according to RFC 1738.
-	  reported by Guillaume Marcais.  [ruby-talk:131650]
-
-Sat Feb 19 18:11:47 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb (DRbObject#respond_to?): take two arguments.
-	  [ruby-dev:25722]
-
-	* test/drb/drbtest.rb: ditto.
-
-Sat Feb 19 13:52:02 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb: call OpenSSL::SSL::SSLSocket#post_connection_check
-	  after connection is made.
-
-Sat Feb 19 01:32:03 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/bigdecimal/lib/bigdecimal/newton.rb: resolved LoadError.
-	  [ruby-dev:25685]
-
-	* ext/bigdecimal/sample/linear.rb: ditto.
-
-	* ext/bigdecimal/sample/nlsolve.rb: ditto.
-
-	* ext/bigdecimal/lib/bigdecimal/nlsolve.rb: removed because this file
-	  is sample script and same file exists in ext/bigdecimal/sample.
-
-Fri Feb 18 17:14:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
-	  of StandardError class, not Exception class.  [ruby-core:04429]
-
-Thu Feb 17 20:11:18 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/drb/drb.rb (DRbServer.default_safe_level): fix typo.
-
-Thu Feb 17 20:11:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/digest/test_digest.rb: separate test case for each algorithms.
-	  [ruby-dev:25412]
-
-Thu Feb 17 11:54:00 2005  Nathaniel Talbott  <ntalbott@ruby-lang.org>
-
-	* lib/test/unit/collector.rb (collect_file): now deletes paths added
-	  to $LOAD_PATH instead of restoring it verbatim.
-
-	* lib/test/unit/autorunner.rb (AutoRunner.run): fixed so that
-	  'ruby -rtest/unit -rtest1 -rtest2 -e0' will use the objectspace
-	  collector again. Also tried to simplify the calling convention.
-
-	* test/runner.rb: adjusted for new AutoRunner semantics.
-
-	* lib/test/unit.rb: ditto.
-
-Thu Feb 17 04:21:47 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
-	  fixed: [ruby-core:04444]
-
-Thu Feb 17 00:09:45 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* test/drb/ignore_test_drb.rb: move TestDRbReusePort to new file
-	  [ruby-dev:25238]
-
-	* test/drb/test_drb.rb: add method DRbService.ext_service, move
-	  TestDRbReusePort to new file [ruby-dev:25238]
-
-	* test/drb/test_drb.rb: ditto.
-
-	* test/drb/test_drbssl.rb: ditto.
-
-	* test/drb/test_drbunix.rb: ditto.
-
-	* test/drb/ut_drb.rb: reduce sleep.
-
-Thu Feb 17 00:02:27 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (is_defined): NODE_IASGN is an assignment.
-
-Wed Feb 16 23:34:30 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb: add lazy stop_service. ([druby-ja:109])
-
-	* lib/drb/extserv.rb: ditto.
-
-Wed Feb 16 17:07:57 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tkutil.c: Follow the change of st.c (st_foreach)
-	  [ruby-list:40623].
-	  Sometimes mis-convert from a Ruby's Array of SJIS Strings, which
-	  includes some kind of SJIS characters, to a Tcl's UTF8 list string.
-
-Mon Feb 14 23:58:17 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/parser.rb (RSS::ListenerMixin::tag_end):
-	  fixed invalid namespace handling bug.
-
-Mon Feb 14 13:12:38 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/openssl/ssl.rb
-	 (OpenSSL::SSL::SSLSocket#post_connection_check): new method.
-
-Mon Feb 14 00:40:49 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb (InvokeMethod.perform): pass DRb info to sub thread.
-
-	* test/drb/test_drb.rb (test_01_safe1_safe4_eval): fix test case.
-
-Sun Feb 13 23:13:46 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/dublincore.rb (RSS::DublicCoreModel#date{,=}): added
-	  convenient methods.
-
-	* lib/rss/0.9.rb (RSS::Rss::Channel#date{,=}): ditto.
-
-	* lib/rss/2.0.rb (RSS::Rss::Channel::Item#date{,=}): ditto.
-
-	* test/rss/: added tests for the convenient methods.
-
-Sun Feb 13 22:43:03 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb (DRbServer): add default_safe_level, safe_level,
-	  config[:safe_level] ([druby-ja:120])
-
-	* test/drb/test_drb.rb, ut_eval.rb, ut_safe1.rb: ditto.
-
-Sun Feb 13 16:56:52 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/cgi.rb (WEBrick::CGI.start): should set reason-phrase
-	  to the value of status header field. ([ruby-dev:40617])
-
-Sun Feb 13 00:52:33 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/erb.rb (ERB::Util.h, u): make it module_function.
-
-Sat Feb 12 17:29:19 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb (OpenURI.open_loop): send authentication only for
-	  the URI directly specified.
-
-Sat Feb 12 15:07:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* random.c (rand_init): suppress warning.
-
-Sat Feb 12 13:54:03 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb: support https if the platform provides CA
-	  certificates.
-
-Sat Feb 12 06:18:28 2005  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
-
-	* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check.
-	  [ruby-dev:25675]
-
-Fri Feb 11 17:40:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths):
-	  new method OpenSSL::X509::Store#set_default_paths.
-
-Fri Feb 11 11:33:53 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb (URI::HTTP#proxy_open): new option supported:
-	  :http_basic_authentication.
-	  suggested by Kent Sibilev.  [ruby-core:4392]
-
-Fri Feb 11 06:30:07 2005  George Ogata  <g_ogata@optushome.com.au>
-
-	* misc/ruby-mode.el: ignore parenthesis inside heredoc.
-	  [ruby-core:04415]
-
-Fri Feb 11 04:54:13 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
-
-	* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
-
-	* lib/rdoc/generators/ri_generator.rb: ditto.
-
-Thu Feb 10 11:14:17 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (COMMON_HEADERS): shouldn't include winsock2.h.
-
-	* ext/socket/extconf.rb (sockaddr_storage): remove workaround for
-	  mswin32.
-
-Thu Feb 10 10:29:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/curses/curses.c: don't need to check HAVE_WCOLOR_SET excluding
-	  window_color_set().
-
-Thu Feb 10 00:47:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* struct.c (make_struct): fixed: [ruby-core:04402]
-
-Wed Feb  9 08:07:08 2005  Paul Duncan  <pabs@pablotron.org>
-
-	* ext/curses/curses.c (window_color_set): [ruby-core:04393]
-
-Tue Feb  8 23:51:47 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb: reject :instance_eval, :class_eval, :module_eval
-	  [druby-ja:117]
-
-Tue Feb  8 13:06:12 2005  Sam Roberts  <sroberts@uniserve.com>
-
-	* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
-	  [ruby-talk:130092]
-
-Tue Feb  8 09:30:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::Cookie): [ruby-talk:130040]
-
-Tue Feb  8 00:19:02 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/resolv.rb (Resolv::DNS::Name#subdomain_of?): new method.
-	  (Resolv::DNS::Name#inspect): ditto.
-	  Suggested by Sam Roberts.  [ruby-talk:129086]
-
-Mon Feb  7 10:06:30 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c: [ruby-doc:818]
-
-Mon Feb  7 01:56:20 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* instruby.rb, rubytest.rb (srcdir): no longer embed srcdir into
-	  rbconfig.rb. (backported from CVS HEAD)
-
-	* ext/socket/extconf.rb (sockaddr_storage): winsock2.h have the
-	  definition of struct sockaddr_storage, but socket.c doesn't
-	  include it because this version of ruby still has binary level
-	  compatibility with winsock1.
-
-	* lib/mkmf.rb (create_makefile): should support header files in
-	  depend file.
-
-Mon Feb  7 01:21:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/extconf.rb: check if getaddrinfo() works fine only when
-	  wide-getaddrinfo option is not given.  fixed: [ruby-dev:25422]
-
-	* lib/mkmf.rb ($extmk): check if under ext directory.
-
-	* lib/mkmf.rb (Logging.postpone): allow recursive operation.
-
-	* lib/mkmf.rb (try_constant): make sure if really a constant, reduce
-	  the number of times of compile.
-
-	* lib/mkmf.rb (have_macro, have_var, byte_order): new functions.
-
-	* lib/mkmf.rb (find_library): allow directory list with separators.
-
-	* lib/mkmf.rb (arg_config): manage provided configuration options.
-
-	* lib/mkmf.rb (dir_config): accept arrays of directory names as
-	  default values.
-
-	* mkconfig.rb: no longer embed srcdir and compile_dir into
-	  rbconfig.rb.
-
-	* lib/mkmf.rb (create_makefile): fix unbalanced parens.
-
-Sun Feb  6 19:23:01 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* eval.c (stack_extend): add prototype because VC++8 doesn't
-	  accept __declspec(noinline) with K&R style function definitions.
-	  (backported from CVS HEAD)
-
-Sun Feb  6 14:14:26 2005  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb (new_with_hash): changed messages of exception.
-
-	* lib/date/format.rb (str[fp]time): undocumented conversion
-	  specifications %[1-3] are now deprecated.
-
-Sun Feb  6 12:20:11 2005  Akinori MUSHA  <knu@iDaemons.org>
-
-	* bignum.c (rb_big2ulong_pack): One too many arguments are passed
-	  to big2ulong().
-
-	* re.c (rb_reg_init_copy, rb_reg_initialize_m): One too many
-	  arguments are passed to rb_reg_initialize().
-
-Sun Feb  6 03:24:20 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/resolv.rb (Resolv::DNS::Resource::TXT): multiple strings was not
-	  handled.
-	  (Resolv::DNS::Resource::TXT#strings): new method to return all
-	  strings.
-	  (Resolv::DNS::Message::MessageEncoder#put_string_list): new method.
-	  (Resolv::DNS::Message::MessageDecoder#get_string_list): ditto.
-	  based on [ruby-talk:129732] by Sam Roberts.
-
-Fri Feb  4 00:30:45 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss: supported Image module.
-	  http://web.resource.org/rss/1.0/modules/image/
-
-Thu Feb  3 23:42:36 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_close, strio_close_read, strio_close_write):
-	  should return nil instead of self as well as IO.  [ruby-dev:25623]
-
-	* ext/stringio/stringio.c (strio_extend, strio_putc): fill with zero
-	  extended portion.  [ruby-dev:25626]
-
-Wed Feb  2 23:52:53 2005  sheepman  <sheepman@tcn.zaq.ne.jp>
-
-	* ext/stringio/stringio.c (strio_truncate): should MEMZERO an extended
-	  part.  [ruby-dev:25618]
-
-Wed Feb  2 21:56:01 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (RSS::Element#convert): added.
-
-	* lib/rss/rss.rb: convert -> need_convert.
-
-	* lib/rss/1.0.rb: ditto.
-
-	* lib/rss/0.9.rb: ditto.
-
-	* lib/rss/2.0.rb: ditto.
-
-	* lib/rss/trackback.rb: ditto.
-
-Tue Feb  1 22:48:48 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb (DRb::DRbObject#respond_to?): check marshal_dump and
-	_dump.
-
-Tue Feb  1 00:20:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (aix): fix linker flags on AIX.  [ruby-talk:125460]
-
-Mon Jan 31 13:33:21 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: add invalid namespace check
-
-	* ext/tk/lib/multi-tk.rb: add invalid_namespace? method
-
-	* ext/tk/lib/remote-tk.rb: ditto
-
-Mon Jan 31 10:29:18 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
-
-Sat Jan 29 09:42:12 2005  Sam Roberts  <sroberts@uniserve.com>
-
-	* lib/resolv.rb (Resolv::DNS::Resource::IN::SRV): Added RFC2782 SRV
-	  resource record for specifying location of services.
-
-Fri Jan 28 17:16:55 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf):
-	  parse options line for ndots option.
-	  (Resolv::Hosts#lazy_initialize): return self.
-	  (Resolv::DNS#lazy_initialize): ditto.
-	  (Resolv::DNS::Config#lazy_initialize): ditto.
-	  Suggested by Sam Roberts.
-
-Thu Jan 27 13:18:03 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* st.c (st_foreach): report success/failure by return value.
-	  [ruby-Bugs-1396]
-
-Thu Jan 27 00:15:29 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* test/fileutils/test_fileutils.rb (setup): support BSD-style
-	  directory group inheritance. (backport from HEAD, rev 1.32)
-
-	* test/fileutils/fileasserts.rb (assert_same_entry): show entry
-	  difference. (backport from HEAD, rev 1.4)
-
-Wed Jan 26 23:09:11 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/protocol.rb (WriteAdapter#puts): should append \n, not
-	  prepend. [ruby-talk:128302] (backport from HEAD, rev 1.75)
-
-Wed Jan 26 10:51:50 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (flock_winnt, flock_win95): unlock file even if
-	  LOCK_NB is specified. (backported from CVS HEAD)
-
-Tue Jan 25 17:11:51 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ruby.c (proc_options): correct -T option in RUBYOPT. (backported
-	  from CVS HEAD)
-
-Tue Jan 25 14:05:52 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: fix SEGV bug; trouble on canceling remained
-	  after scripts [ruby-dev:25479]: NULL current namespace when deleting
-	    Tk interpreter [ruby-talk:126225]
-
-	* ext/tcltklib/extconf.rb: bug fix; TCL_ENABLE_THREAD flag is inverted
-	  [ruby-talk:126360]
-
-	* ext/tcltklib/extconf.rb: add yet another native-thread check
-
-	* ext/tk/tkutil.c: fix SEGV bug; NULL string pointer when finalize
-	  Ruby interpreter
-
-	* ext/tk/lib/multi-tk.rb: avoid warning for deleted safeTk ip frame
-
-	* ext/tk/lib/tk/bindtag.rb: bug fix; new method of named bindtag
-	  doesn't return the created object [ruby-dev:25479]
-
-	* ext/tk/lib/tk/menu.rb: bug on treating arguments [ruby-dev:25479]
-
-	* ext/tk/lib/tk.rb: bug fix; cannot accept a callback ID string for
-	  a command argument [ruby-dev:25479]
-
-	* ext/tk/lib/multi-tk.rb: ditto
-
-	* ext/tk/lib/tk/*.rb: ditto
-
-	* ext/tk/lib/tkextlib/*.rb: ditto
-
-	* ext/tk/sample/demos-jp/anilabel.rb: new demo script
-
-	* ext/tk/sample/demos-en/anilabel.rb: ditto
-
-	* ext/tk/sample/tkHTML/ss.rb: local variable scope bug fix
-	  [ruby-dev:25479]
-
-Mon Jan 24 15:44:25 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
-
-	* lib/rdoc/parsers/parse_c.rb: allow whitespace after function names.
-	  [ruby-core:4296]
-
-	* lib/rdoc/parsers/parse_simple.rb: adds support for private comments
-	  in the "simple" parser. [ruby-core:4301]
-
-Mon Jan 24 15:44:25 2005  Charles Mills  <cmills@freeshell.org>
-
-	* lib/rdoc/parsers/parse_c.rb: adds support for constants
-	  (rb_define_const), accessors (rb_define_attr), and makes a
-	  couple fixes. [ruby-core:4307]
-
-Mon Jan 24 15:44:25 2005  Florian Gro  <florgro@gmail.com>
-
-	* lib/rdoc/parsers/parse_rb.rb: Logic for def Builtin.method() end
-	  [ruby-core:4302]
-
-Mon Jan 24 15:44:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* document updates - [ruby-core:04296], [ruby-core:04301],
-	  [ruby-core:04302], [ruby-core:04307]
-
-Sun Jan 23 12:41:16 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/soap/wsdlDriver.rb: from 1.5.3-ruby1.8.2, operation which has
-	  capitalized name (such as KeywordSearchRequest in AWS) is defined as
-	  a method having uncapitalized name. (converted with
-	  GenSupport.safemethodname to handle operation name 'foo-bar').  it
-	  introduced serious incompatibility; in the past, it was defined as a
-	  capitalized.
-
-	  define capitalized method as well under that circumstance.
-
-Sun Jan 23 05:24:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_to_der): should call
-	  GetOCSPReq at first.
-
-Sat Jan 22 23:09:47 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/ssl.rb (accept): rescue SSLError. [druby-ja:110]
-
-Sat Jan 22 22:35:03 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/unix.rb: fail if UNIXFileOwner is set. [druby-ja:111]
-
-Fri Jan 21 23:58:42 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_set_pos): clear EOF flag.
-	  [ruby-talk:127511]
-
-Fri Jan 21 20:07:02 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/resolv.rb (Resolv::DNS::Config.resolv): don't raise ResolvError.
-	  reported by Sam Roberts.  [ruby-talk:127133]
-
-Fri Jan 21 16:58:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (rb_push_glob): should work for NUL delimited patterns.
-
-Fri Jan 21 13:58:37 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (u8tou16): fixed typo. fixed: [ruby-list:40546]
-	  (backported from CVS HEAD)
-
-Fri Jan 21 09:30:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* rubyio.h (rb_eof_error): should mark as NORETURN. (backported
-	  from CVS HEAD)
-
-Fri Jan 21 00:31:36 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/syck/rubyext.c (syck_parser_bufsize_set): avoid VC++ warning
-	  "local variable 'size' used without having been initialized".
-
-Thu Jan 20 19:03:24 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/extmk.rb (extmake): shouldn't set $extflags on mswin32.
-
-	* win32/Makefile.sub (LIBRUBY_SO): should use $DLDOBJS instead of
-	  $EXTOBJS.
-	  fixed: [ruby-core:04290] (backported from CVS HEAD)
-
-Thu Jan 20 11:42:02 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_new4): should propagate taintedness.
-
-	* struct.c (rb_struct_set): use original method name, not callee
-	  name, to retrieve member slot.  [ruby-core:04268]
-
-	* time.c (time_strftime): protect from format modification from GC
-	  finalizers.
-
-Wed Jan 19 18:06:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/ipaddr.rb (to_s, test_to_s): too many colons with some cases.
-	  (backported from CVS HEAD)
-
-Wed Jan 19 01:16:30 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf): ignore
-	  domain and search directive without an argument.
-	  reported by Sam Roberts.  [ruby-talk:126781]
-
-Tue Jan 18 15:03:05 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/ssl.rb (WEBrick::Config::SSL): the default value
-	  of :SSLEnable is false.
-
-	* lib/webrick/server.rb (WEBrick::Daemon.start): prepared stdio
-	  don't allow changing its mode.
-
-	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_service):
-	  should delete trailing LF from the result of pack("m*").
-
-	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
-	  - should delete trailing LF from the result of pack("m*").
-	  - clear Request-Line not to send the response by HTTPServer#run.
-
-	* lib/webrick/httputils (WEBrick::HTTPUtils.parse_qvalues):
-	  refine regexp (and change the name of a local variable).
-
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils#escape_path): add
-	  new method to escape URI path component.
-
-	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line): should
-	  escape SCRIPT_NAME and PATH_INFO before being parsed as a URI.
-
-	* test/webrick/*, sample/webrick/httpproxy.rb: add new file.
-
-Mon Jan 17 23:33:46 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (aix): fix typo.  [ruby-talk:126401]
-
-Mon Jan 17 07:08:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/readline/readline.c: suppress warnings.
-
-	* lib/irb/extend-command.rb (IRB::ContextExtender.def_extend_command):
-	  ditto.
-
-	* lib/irb/ext/history.rb (IRB::Context::set_last_value): ditto.
-
-	* lib/irb/ext/history.rb (IRB::Context::eval_history): ditto.
-
-	* lib/irb/locale.rb (IRB::Locale::real_load): ditto.
-
-	* lib/irb/slex.rb (SLex::Node::create_subnode): remove garbage.
-
-Mon Jan 17 00:09:42 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/uri/common.rb (PORT): typo fix. fixed: [ruby-core:04256]
-
-Sat Jan 15 14:57:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (proc_options): ignore trailing CRs at the end of short
-	  options as well as long options.  fixed: [ruby-core:04232]
-
-Sat Jan 15 13:35:16 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (RSS::VERSION): 0.1.2 -> 0.1.3.
-
-	* lib/rss/rss.rb: accept inheritance. [ruby-talk:126104]
-
-Thu Jan 13 04:48:53 2005  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (io_fread): don't warn nonblocking behavior by default.
-
-Wed Jan 12 00:36:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_class_superclass): superclass of singleton class also
-	  should be a singleton class.  fixed: [ruby-list:40519]
-
-Tue Jan 11 09:44:40 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* numeric.c (Init_Numeric): turn off floating point exceptions
-	  on bcc32. "1e300".to_f had crashed by overflow.
-
-Tue Jan 11 03:10:10 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (copy_entry): could not copy symbolic link.
-	  [ruby-talk:125733]
-
-	* lib/fileutils.rb (copy_stream): use read/write instead of
-	  sysread/syswrite.
-
-Mon Jan 10 23:08:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_autoload): hide internal data from ruby level.
-	  fixed: [ruby-dev:25435], [ruby-list:40498]
-
-Mon Jan 10 01:22:55 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (rb_data_object_alloc): klass may be NULL.
-	  [ruby-list:40498]
-
-Sun Jan  9 03:12:58 2005  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (io_fread): warn nonblocking behavior.
-	  (io_readpartial): new method IO#readpartial.
-
-Sat Jan  8 04:38:47 2005  why the lucky stiff  <why@ruby-lang.org>
-
-	* lib/yaml.rb: Kernel#y requires an argument.
-
-Fri Jan  7 21:12:29 2005  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
-
-	* random.c (rand_init): use ALLOC_N instead of ALLOCA_N
-	  [ruby-dev:25426]
-
-Fri Jan  7 18:03:35 2005  Tanaka Akira  <akr@m17n.org>
-
-	* gc.c (mark_locations_array): avoid core dump with -O3.
-	  [ruby-dev:25424]
-
-Thu Jan  6 20:31:07 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/zlib/zlib.c (zstream_end): should return value. (backported
-	  from CVS HEAD)
-
-Thu Jan  6 19:55:13 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.c (rb_w32_close): didn't close socket handle.
-	  [ruby-dev:25414]
-
-	* win32/win32.c (rb_w32_open_osfhandle): bcc32's _open_osfhandle
-	  never set EMFILE.
-
-Thu Jan  6 17:14:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* random.c (random_seed): O_NONBLOCK isn't defined on some
-	  platforms. [ruby-dev:25417]
-
-Thu Jan  6 13:45:35 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/time.rb: recognize +00:00 and GMT as a localtime.
-
-Thu Jan  6 07:58:28 2005  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/usage.rb (RDoc::RDoc.usage_no_exit): Allow for colons
-	  in path names on DOS machines. (thanks to Johan Nilsson)
-
-Wed Jan  5 20:16:32 2005  Tanaka Akira  <akr@m17n.org>
-
-	* random.c (limited_big_rand): didn't work if SIZEOF_BDIGITS == 2.
-	  [ruby-dev:25408]
-
-	* random.c (random_seed): refined.
-
-Wed Jan  5 12:49:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_thread_initialize): Thread objects cannot be initialized
-	  again.  fixed: [ruby-core:04067]
-
-Wed Jan  5 10:48:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* dir.c (dir_s_mkdir): win32 special processing doesn't need any
-	  longer. (backported from CVS HEAD)
-
-	* win32/win32.[ch] (rb_w32_mkdir): new function. POSIX.1 compatible
-	  interface. (backported from CVS HEAD)
-
-	* win32/win32.[ch] (rb_w32_rmdir): new function. (backported from CVS
-	  HEAD)
-
-Wed Jan  5 02:30:11 2005  Tanaka Akira  <akr@m17n.org>
-
-	* random.c (init_by_array): imported from mt19937ar-cok.tgz.
-	  (genrand_int32): ditto.
-	  (genrand_real): replaced with genrand_res53 in mt19937ar-cok.
-	  (rand_init): support bignum for longer seed.
-	  (random_seed): generate longer seed.
-	  (make_mask): new function.
-	  (limited_rand): ditto.
-	  (limited_big_rand): ditto.
-	  (rb_f_rand): call limited_rand and limited_big_rand.
-	  [ruby-dev:25403]
-
-Tue Jan  4 23:25:29 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_rand): should return positive random number.
-	  [ruby-dev:25401]
-
-Tue Jan  4 11:15:29 2005  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
-
-	* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
-	  random bignums.  [ruby-dev:25396]
-
-Mon Jan  3 14:01:54 2005  Tanaka Akira  <akr@m17n.org>
-
-	* random.c (random_seed): don't use /dev/urandom if it is not
-	  character device.
-
-Mon Jan  3 11:37:42 2005  Tanaka Akira  <akr@m17n.org>
-
-	* random.c (random_seed): use /dev/urandom if available.
-	  [ruby-dev:25392]
-
-Mon Jan  3 07:46:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpauth/htpasswd.rb (WEBrick::Htpasswd#reload):
-	  raise NotImplementedError if password is encrypted by digest
-	  algorithms. This patch is contributed by sheepman. [ruby-list:40467]
-
-	* lib/webrick/httpauth/digestauth.rb
-	  (WEBrick::HTTPAuth::DigestAuth#_authenticate): fix digest calculation.
-	  This patch is contributed by sheepman. [ruby-list:40482]
-
-	* lib/webrick/{httpauth.rb,httpauth/basicauth.rb,httpproxy.rb}: use
-	  pack/unpack-template char "m" instead of lib/base64.rb to do base64
-	  encoding/decoding. fixed: [ruby-dev:25336]
-
-	* test/webrick/test_httpauth.rb: new file.
-
-Sat Jan  1 04:20:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ns_spki.c (ossl_spki_set_challenge): should call
-	  StringValue before GetSPKI. fixed: [ruby-dev:25359].
-
-Sat Jan  1 01:13:28 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_autoload): [ruby-dev:25373]
-
-Fri Dec 31 14:10:43 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item): Fix problem
-	  if heading contains formatting.
-
-Thu Dec 30 00:41:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (svalue_to_avalue): [ruby-dev:25366]
-
-	* string.c (rb_str_justify): [ruby-dev:25367]
-
-Wed Dec 29 11:07:07 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/generators/template/html/kilmer.rb: Update to use new
-	  sections.
-
-Tue Dec 28 22:31:46 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_justify): create buffer string after argument type
-	  conversion.  fixed: [ruby-dev:25341]
-
-Tue Dec 28 15:41:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c (reinit): should initialize all static
-	  variables.  fixed: [ruby-list:40445]
-
-Tue Dec 28 15:25:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): second byte is up to
-	  0xfe.
-
-	* ext/nkf/lib/kconv.rb (Kconv#kconv): should handle UTF8 and UTF16
-	  properly.
-
-Tue Dec 28 13:35:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/zlib/zlib.c (rb_deflate_s_deflate, rb_inflate_s_inflate): ensure
-	  freeing internal zstreams.  fixed: [ruby-dev:25309]
-
-	* ext/zlib/zlib.c (rb_deflate_init_copy): replace rb_deflate_clone.
-
-Tue Dec 28 12:26:45 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub, win32/setup.mak (RDOCTARGET, install,
-	  install-nodoc, install-doc): rdoc support for mswin32.
-
-	* win32/configure.bat (--enable-install-doc, --disable-install-doc):
-	  ditto.
-
-Mon Dec 27 20:02:14 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: fix SEGV bug when deleting Tk interp
-
-	* ext/tk/lib/multi-tk.rb: ditto
-
-Mon Dec 27 16:55:17 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_x509name.c (Init_ossl_x509name): should use
-	  rb_hash_new to get exactly a Hash. fix [ruby-dev:25325].
-
-Mon Dec 27 16:29:56 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_justify): [ruby-dev:25341]
-
-Mon Dec 27 15:47:48 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* test/fileutils/fileasserts.rb: sync with HEAD.
-
-	* test/fileutils/test_fileutils.rb: ditto.
-
-	* test/fileutils/test_nowrite.rb: ditto.
-
-Mon Dec 27 15:21:07 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (mv): should raise error when moving a
-	  directory to the (empty) directory. [ruby-talk:124368]
-	  (backport from HEAD 1.48)
-
-	* lib/fileutils.rb (mv): wrongly did not overwrite file on Win32
-	  platforms. (backport from HEAD 1.48)
-
-Sat Dec 25 11:11:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* stable version 1.8.2 released.
-
-Sat Dec 25 04:23:49 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (mkdir, mkdir_p): should ensure directory
-	  permission. (backportted from HEAD, 1.47)
-
-	* lib/fileutils.rb (traverse, remove_dir): untaint trasted
-	  objects. (backportted from HEAD, 1.46)
-
-Sat Dec 25 01:28:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c: cancel io_reopen() change on Dec. 24th.
-
-	* dln.c: use <dlfcn.h> for NetBSD.  [ruby-dev:25313]
-
-	* io.c (rb_f_select): IO list could be altered.  [ruby-dev:25312]
-
-Fri Dec 24 23:51:48 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/Makefile.sub: bcc32 should use RTL dll (backport from HEAD)
-	  [ruby-dev:25306]
-
-	* win32/win32.[ch]: ditto.
-
-Fri Dec 24 23:27:18 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/image.rb: TkPhotoImage#cget bug fix
-
-Fri Dec 24 18:39:25 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.[ch]: failed to compile on bcc32 (and probably wince)
-	  [ruby-dev:25306]
-
-Fri Dec 24 02:52:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (io_reopen, rb_io_reopen): prohibit to change access mode for
-	  special IO ports.  [ruby-dev:25225]
-
-Fri Dec 24 02:22:53 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/syck/rubyext.c (rb_syck_io_str_read): [ruby-core:03973]
-
-	* ext/syck/rubyext.c (syck_loader_transfer): check type conversion.
-
-	* ext/syck/rubyext.c (syck_parser_assign_io, rb_new_syck_node): duck
-	  typing.
-
-	* ext/syck/rubyext.c (syck_parser_s_alloc, syck_parser_initialize):
-	  allocation framework.
-
-	* ext/syck/rubyext.c (syck_emitter_s_alloc, syck_emitter_initialize):
-	  ditto.
-
-Fri Dec 24 01:21:00 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkextlib/blt.rb: add BLT extension support
-
-	* ext/tk/lib/tkextlib/blt/*.rb: ditto
-
-	* ext/tk/lib/tkextlib/blt/tile/*.rb: ditto
-
-Thu Dec 23 23:36:28 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (proc_setgroups): check if the argument lenght is
-	  modified.  fixed: [ruby-dev:25285]
-
-Thu Dec 23 13:13:33 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: define TclTkLib::COMPILE_INFO and
-	  RELEASE_DATE
-
-	* ext/tcltklib/extconf.rb: ditto
-
-	* ext/tk/tkutil.c: define TkUtil::RELEASE_DATE
-
-	* ext/tk/lib/tk.rb: define Tk::RELEASE_DATE
-
-Thu Dec 23 09:38:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (io_reopen): restore exact mode.  fixed: [ruby-core:04003]
-
-Thu Dec 23 00:16:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (bsdi): use $(CC) for LDSHARED.  fixed [ruby-dev:25270]
-
-Wed Dec 22 11:14:55 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_mode_modenum): replace O_ACCMODE with O_RDWR.
-	  fixed: [ruby-dev:25273]
-
-Wed Dec 22 08:34:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/dl/sym.c (rb_dlsym_initialize): extract internal pointers after
-	  all argument conversion.  fixed: [ruby-dev:25271]
-
-Wed Dec 22 00:08:01 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/soap/*, test/soap/*, sample/soap/authheader/*: eval cleanup.
-
-Tue Dec 21 22:07:33 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
-	  ossl_asn1_decode_all): temporary value should be marked volatile.
-
-Tue Dec 21 14:40:02 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
-	  ossl_asn1_decode_all): use rb_str_new4 to avoid SEGV.
-	  fix [ruby-dev:25261]
-
-	* test/openssl/test_asn1.rb: add tests for OpenSSL::ASN1.
-
-Tue Dec 21 12:22:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (io_reopen): keep duplex pipe in correct mode for exception
-	  safeness.  fixed: [ruby-dev:25152]
-
-Tue Dec 21 12:10:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/grid.rb: rescue bug of 'grid configure' on Tcl/Tk8.3-
-
-Tue Dec 21 00:53:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse): [ruby-dev:25261]
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_decode): ditto.
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_decode_all): ditto.
-
-Mon Dec 20 23:22:26 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* added files:
-	  * lib/soap/mapping/wsdl*.rb
-	  * lib/wsdl/soap/element.rb
-	  * lib/wsdl/xmlSchema/simpleContent.rb
-
-	* modified files:
-	  * lib/soap/*
-	  * lib/wsdl/*
-	  * lib/xsd/*
-	  * test/soap/*
-	  * test/wsdl/*
-	  * test/xsd/*
-	  * sample/soap/*
-	  * sample/sdl/*
-
-	* summary
-	  * imported from the soap4r repository.  Version: 1.5.3-ruby1.8.2
-
-	  * added several XSD basetype support: nonPositiveInteger,
-	    negativeInteger, nonNegativeInteger, unsignedLong, unsignedInt,
-	    unsignedShort, unsignedByte, positiveInteger
-
-	  * HTTP client connection/send/receive timeout support.
-
-	  * HTTP client/server gzipped content encoding support.
-
-	  * improved WSDL schema definition support; still is far from
-	    complete, but is making step by step improovement.
-
-Mon Dec 20 22:56:39 2004  Tanaka Akira  <akr@m17n.org>
-
-	* gc.c (stack_end_address): gcc noinline attribute is available since
-	  gcc-3.1.
-
-Mon Dec 20 14:07:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: supports new features of Tcl/Tk8.5a2
-
-	* ext/tk/lib/tk/clock.rb: ditto
-
-	* ext/tk/lib/tk/text.rb: ditto
-
-	* ext/tk/lib/tk/panedwindow.rb: ditto
-
-Mon Dec 20 12:47:13 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/net/https.rb,protocols.rb,telnets.rb: delete
-	  doc and code about SSLContext#{key_file,cert_file}.
-	  fixed: [ruby-dev:25243]
-
-Mon Dec 20 12:42:17 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (io_fwrite): workaround for MSVCRT's bug.
-	  fixed: [ruby-core:03982]
-
-Mon Dec 20 11:21:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_eof): check if closed before clearerr().
-	  fixed: [ruby-dev:25251]
-
-Mon Dec 20 03:30:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/cgi/session.rb (CGI::Session#initialize): empty session id was
-	  used if request had no session key.  fixed: [ruby-core:03981]
-
-Mon Dec 20 01:51:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* struct.c (make_struct): [ruby-dev:25249]
-
-Mon Dec 20 00:28:20 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/encodings/SHIFT-JIS.rb: backported from CVS HEAD.
-
-	* lib/rexml/encodings/SHIFT_JIS.rb: ditto.
-
-Sun Dec 19 17:19:48 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_x509store.c
-	  (ossl_x509store_set_time): add OpenSSL::X509::Store#time=.
-	  (ossl_x509stctx_set_time): add OpenSSL::X509::StoreContext#time=.
-
-	* test/openssl/ossl_x509store.rb: test certificate validity times.
-
-	* ext/openssl/ossl_x509name.c (ossl_x509name_to_s): add optional
-	  second argument to specify the output format (see also
-	  X509_NAME_print_ex).
-
-	* ext/openssl/ossl_x509name.c (ossl_x509name_init): new constants:
-	  OpenSSL::X509::Name::COMPAT, OpenSSL::X509::Name::RFC2253,
-	  OpenSSL::X509::ONELINE, OpenSSL::X509::MULTILINE.
-
-	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name::RFC2253DN):
-	  new module to provide the parse for RFC2253 DN format.
-
-	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name.parse_rfc2253):
-	  new method to parse RFC2253 DN format.
-
-	* test/openssl/ossl_x509name.rb: add tests about RFC2253 DN.
-
-	* text/openssl/ssl_server.rb: try to listen ports from 20443 to 20542
-	  while EADDRINUSE is raised.
-
-	* all changes in this entry are backport from 1.9.
-
-Sun Dec 19 17:24:59 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (enable_rpath): use rpath flag to embed the library
-	  path into extensions on ELF environment.  [ruby-dev:25035]
-
-Sun Dec 19 11:01:25 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit.rb: use standalone runner for -e.
-
-	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner#options): accept
-	  multiple -p and -x options.
-
-	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#recursive_collect):
-	  ditto.
-
-Sat Dec 18 16:36:23 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/zlib/zlib.c (rb_deflate_s_deflate, rb_inflate_s_inflate):
-	  disallow interrupt by type conversion.  fixed: [ruby-dev:25226]
-
-Sat Dec 18 15:16:41 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/webrick/httpauth.rb,
-	  lib/webrick/httpauth/{basicauth.rb,digestauth.rb}: use
-	  pack/unpack-template char "m" instead of lib/base64.rb to do base64
-	  encoding/decoding.
-
-Sat Dec 18 10:51:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (dir_open_dir): new function.  [ruby-dev:25242]
-
-Fri Dec 17 18:07:01 2004  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* test/readline/test_readline.rb: fix for BSD. Thanks, GOTOU Yuuzou.
-	  fixed: [ruby-dev:25218]
-
-Fri Dec 17 16:28:12 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: fix bug on setting up system encoding
-
-	* ext/tk/lib/tk/event.rb: fix error on require process
-
-	* ext/tk/lib/tk/font.rb: fix abnormal termination error on Windows
-
-	* ext/tk/lib/tk/virtevent.rb: TkVirtualEvent::PreDefVirtEvent.new()
-	  accepts event-sequence arguments
-
-	* ext/tk/lib/tk/text.rb: fail to dump embedded images
-
-	* ext/tk/lib/tk/text.rb: tag_nextrange and tag_prevrange returns wrong
-	  types of values
-
-	* ext/tk/lib/tk/texttag.rb: nextrange and prevrange returns wrong
-	  types of values
-
-	* ext/tk/lib/tk/text.rb: add TkText::IndexModMethods module and
-	  TkText::IndexString class to treat text index modifiers
-
-	* ext/tk/lib/tk/texttag.rb: use TkText::IndexModMethods module
-
-	* ext/tk/lib/tk/textmark.rb: ditto
-
-	* ext/tk/lib/tk/textimage.rb: ditto
-
-	* ext/tk/lib/tk/textwindow.rb: ditto
-
-	* ext/tk/lib/tk/textimage.rb: wrong gravity of text mark for embedded
-	  image
-
-	* ext/tk/lib/tk/textwindow.rb: wrong gravity of text mark for
-	  embedded window
-
-Fri Dec 17 13:50:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
-
-	* vms/vmsruby_private.c, vms/vmsruby_private.h: private routines
-	  for VMS port are added.
-
-	* eval.c (ruby_init): change to call VMS private intialization routine.
-
-Fri Dec 17 13:33:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/cgi/session.rb (CGI::Session#initialize): control adding
-	  session_id hidden fields.  fixed: [ruby-talk:123850]
-
-Thu Dec 16 23:25:25 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb, lib/drb/ssl.rb: backported from CVS HEAD.
-	  [druby-ja:101]
-
-	* test/drb/test_drb.rb: adjust and reduce sleep (backported from
-	  CVS HEAD.)
-
-Thu Dec 16 18:44:58 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should wait
-	  for reading request till data arrive. [ruby-talk:121068]
-
-	* lib/webrick/server.rb (WEBrick::GenericServer#start_thread):
-	  should log about all accepted socket. [ruby-core:03962]
-
-	* lib/webrick/accesslog.rb (WEBrick::AccessLog#setup_params):
-	  "%%" and "%u" are supported. [webricken:135]
-
-	* lib/webrick/httpservlet/filehandler.rb
-	  (WEBrick::HTTPServlet::FileHandler#check_filename):
-	  :NondisclosureName is acceptable if it is Enumerable.
-
-	* lib/webrick/config.rb (WEBrick::Config::FileHandler):
-	  default value of :NondisclosureName is [".ht*", "*~"].
-
-Thu Dec 16 18:36:52 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl.c (ossl_raise): refine message format.
-
-Thu Dec 16 16:29:44 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/sample/demos-en/widget: modify version check for
-	  supporting features
-
-Thu Dec 16 16:03:50 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/bindtag.rb: bug fix [ruby-talk: 123667]
-
-	* ext/tk/lib/tk/timer.rb: accept :idle for the interval argument
-
-	* ext/tk/lib/tk.rb: add TkComm._callback_entry?()
-
-	* ext/tk/lib/multi-tk.rb: add MultiTkIp.cb_entry_class
-
-	* ext/tk/lib/tk/canvas.rb: use TkComm._callback_entry?()
-
-	* ext/tk/lib/tk/canvastag.rb: ditto
-
-	* ext/tk/lib/tk/dialog.rb: ditto
-
-	* ext/tk/lib/tk/optiondb.rb: ditto
-
-	* ext/tk/lib/tk/text.rb: ditto
-
-	* ext/tk/lib/tk/texttag.rb: ditto
-
-	* ext/tk/lib/tk/textwindow.rb: ditto
-
-	* ext/tk/lib/tk/timer.rb: ditto
-
-	* ext/tk/lib/tk/validation.rb: ditto
-
-	* ext/tk/lib/tkextlib/*: ditto
-
-Thu Dec 16 03:14:28 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb (basic_encode): return value of pack('m') may
-	  include multiple CR/LFs.  Backported from main trunk (rev 1.112).
-	  [ruby-dev:25212]
-
-Thu Dec 16 00:33:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (Init_Hash): remove custom "hash" and "eql?".
-
-Wed Dec 15 18:57:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/set.rb (Set::eql): wrong definition.  [ruby-dev:25207]
-
-Wed Dec 15 18:48:42 2004  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* ext/curses/curses.c (window_subwin): call NUM2INT() before
-	GetWINDOW(). (backported from CVS HEAD)
-
-Wed Dec 15 17:03:50 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.[ch] (rb_w32_isatty): new function to replace MSVCRT's
-	  isatty because it never sets errno. (backported from CVS HEAD)
-
-Wed Dec 15 15:39:32 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_x509name.c (ossl_x509name_to_a): avoid SEGV
-	  (rollback the previous commit).
-
-Wed Dec 15 16:10:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_obj_id_obsolete): warn always.
-
-	* eval.c (rb_enable_super): ditto.
-
-Wed Dec 15 15:31:02 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/set.rb (Set#==): [ruby-dev:25206]
-
-Wed Dec 15 14:22:10 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_fdisset): check whether the handle is valid.
-	  fixed: [ruby-core:03959]
-
-Wed Dec 15 10:30:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/openssl/ossl_digest.c (ossl_digest_initialize): [ruby-dev:25198]
-
-Tue Dec 14 17:10:09 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_close): need to reset osfhnd().
-
-Tue Dec 14 14:03:57 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl.c (ossl_raise): avoid buffer overrun.
-	  [ruby-dev:25187]
-
-Tue Dec 14 12:36:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi/session.rb (CGI::Session::initialize): generate new
-	  session if given session_id does not exist.  [ruby-list:40368]
-
-Mon Dec 13 18:13:52 2004  Tanaka Akira  <akr@m17n.org>
-
-	* gc.c (stack_end_address): new function to obtain stack end address.
-	  stack_end_address calls __builtin_frame_address(0) to obtain the
-	  frame pointer of a stack frame of stack_end_address.  The address
-	  is the stack pointer of the caller's stack frame.
-	  (SET_STACK_END): use stack_end_address.
-	  This makes the conservative garbage collector to scan a stack frame
-	  of the garbage_collect function itself.  This is required because
-	  callee-save registers may be stored in the frame.
-	  [ruby-dev:25158]
-
-Mon Dec 13 00:58:02 2004  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb (cleanpath_aggressive): make it private.
-	  (cleanpath_conservative): ditto.
-	  Suggested by Daniel Berger.  [ruby-core:3914]
-
-Sun Dec 12 20:06:38 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb: backported from CVS HEAD.
-
-Sun Dec 12 10:35:10 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Don't
-	  show an accessor's r/w flag if none was specified
-
-Sun Dec 12 10:14:03 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/rdoc.rb (RDoc::RDoc::parse_files): Never exclude files
-	  explicitly given on the command line.
-
-Sun Dec 11 23:54:07 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/*: update to support libraries in ActiveTcl8.4.12.0
-	  (see ext/tk/ChangeLog.tkextlib).
-
-	* ext/tk/sample/scrollframe.rb: add a new sample.
-
-Sat Dec 11 20:12:21 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb: add DRbRemoteError. [ruby-list:40348],
-	  [ruby-list:40390]
-
-	* test/drb/drbtest.rb: ditto.
-
-	* test/drb/ut_drb.rb: ditto.
-
-Sat Dec 11 15:38:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/jcode.rb (String::succ): [ruby-dev:25156]
-
-Sat Dec 11 12:41:55 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* eval.c (run_trap_eval): prototype; avoid VC++ warnings.
-
-	* ext/socket/getaddrinfo.c: fix typo. fixed: [ruby-core:03947]
-
-	* win32/win32.c: need to include dln.h.
-
-Sat Dec 11 00:10:18 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_reopen): [ruby-dev:25150]
-
-Fri Dec 10 08:39:27 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/socket.c (sock_listen): get OpenFile just before calling
-	  listen(2).  fixed: [ruby-dev:25149]
-
-Thu Dec  9 17:00:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
-
-	* ext/socket/socket.c, ext/socket/getaddrinfo.c: port to VMS
-
-Thu Dec  9 16:31:02 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/sdbm/init.c (GetDBM): typo.
-
-Thu Dec  9 16:05:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
-
-	* defines.h: change path of vms.h
-	* vms/vms.h: delete reference for snprintf()
-	* vms/config.h: new file
-	* vms/config.h_in: deleted
-
-Thu Dec  9 14:38:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_inspect): escape # which starts an expression
-	  substitution.  fixed: [ruby-core:03922]
-
-	* string.c (rb_str_dump): not escape # which isn't a substitution.
-
-Thu Dec  9 10:54:36 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/dbm/dbm.c (fdbm_select): [ruby-dev:25132]
-
-	* ext/sdbm/init.c: ditto.
-
-	* ext/gdbm/gdbm.c: ditto.
-
-Thu Dec  9 03:08:36 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c (ip_init): set root-win title to "ruby" when
-	  the running script is '-e one-liner' or '-' (stdin).
-
-	* ext/tcltklib/extconf.rb: add find_library("#{lib}#{ver}",..) for
-	  stub libs
-
-	* ext/tk/lib/tk/textmark.rb: TkTextMarkCurrent and TkTextMarkAnchor
-	  have a wrong parent class.
-
-	* ext/tk/lib/tk/dialog.rb: rename TkDialog2 --> TkDialogObj and
-	  TkWarning2 --> TkWarningObj (old names are changed to alias names)
-
-	* ext/tk/lib/tk/dialog.rb: bug fix of treatment of 'prev_command'
-	  option and hashes for configuration
-
-	* ext/tk/lib/tk/dialog.rb: add TkDialogObj#name to return the
-	  button name
-
-	* ext/tk/lib/tk/radiobutton.rb: rename enbugged method value() ==>
-	  get_value() and value=(val) ==> set_value(val).
-
-	* ext/tk/lib/tk/menu.rb: add TkMenu.new_menuspec
-
-	* ext/tk/lib/tk/menu.rb: add alias (TkMenuButton = TkMenubutton,
-	  TkOptionMenuButton = TkOptionMenubutton)
-
-	* ext/tk/lib/tk/event.rb: new method aliases (same as option keys of
-	  event_generate) for Event object
-
-	* ext/tk/lib/tk/font.rb: configinfo returns proper types of values
-
-	* ext/tk/lib/tk.rb: bind methods accept subst_args + block
-
-	* ext/tk/lib/tk/canvas.rb: ditto
-
-	* ext/tk/lib/tk/canvastag.rb: ditto
-
-	* ext/tk/lib/tk/frame.rb: ditto
-
-	* ext/tk/lib/tk/text.rb: ditto
-
-	* ext/tk/lib/tk/texttag.rb: ditto
-
-	* ext/tk/lib/tk/toplevel.rb: ditto
-
-	* ext/tk/lib/tkextlib/*: ditto and bug fix
-
-Wed Dec  8 23:54:29 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Typo
-	  meant that h2 tag was invisible.
-
-Wed Dec  8 21:56:31 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss, test/rss, sample/rss: backported from CVS HEAD.
-
-Wed Dec  8 14:31:36 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_fwrite): change dereference for cosmetic reason.
-
-	* sprintf.c (rb_f_sprintf): [ruby-dev:25104]
-
-Tue Dec  7 19:08:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
-
-	* io.c (io_fwrite): fix offset incrementation (for VMS and Human68k)
-
-Tue Dec  7 00:27:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (proc_setgroups): [ruby-dev:25081]
-
-Mon Dec  6 18:08:10 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_eqq): document fix.  [ruby-talk:122541]
-
-Mon Dec  6 17:19:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* rubysig.h (TRAP_BEG, TRAP_END): safe errno around CHECK_INTS.
-	  (backported from CVS HEAD)  [ruby-dev:24993]
-
-Mon Dec  6 10:18:17 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::look_for_directives_in):
-	  Oops - 1.8 doesn't have String#clear
-
-Mon Dec  6 09:59:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (sock_connect): use rb_str_new4().
-	  [ruby-dev:25052]
-
-Mon Dec  6 01:42:08 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_public_encrypt,
-	  ossl_rsa_public_decrypt, ossl_rsa_private_encrypt,
-	  ossl_rsa_private_decrypt): should take an optional argument
-	  to specify padding mode. [ruby-talk:122539]
-
-	* ext/openssl/ossl_pkey_rsa.c (Init_ossl_rsa): add new constants
-	  PKCS1_PADDING, SSLV23_PADDING, NO_PADDING and PKCS1_OAEP_PADDING
-	  under OpenSSL::PKey::RSA.
-
-	* test/openssl/test_pkey_rsa.rb: new file.
-
-Sun Dec  5 19:39:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser::Completion#complete): new parameter
-	  to direct case insensitiveness.
-
-	* lib/optparse.rb (OptionParser#order!): ignore case only for long
-	  option.  [ruby-dev:25048]
-
-Sat Dec  4 22:54:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_write): remove rb_str_locktmp().  [ruby-dev:25050]
-
-	* io.c (io_fwrite): takes VALUE string as an argument.
-	  [ruby-dev:25050]
-
-	* ext/socket/socket.c (sock_connect): remove rb_str_locktmp().
-	  [ruby-dev:25050]
-
-	* ext/socket/socket.c (udp_connect): [ruby-dev:25045]
-
-	* ext/socket/socket.c (udp_bind): ditto.
-
-	* ext/socket/socket.c (udp_send): ditto.
-
-	* ext/socket/socket.c (bsock_send): ditto.
-
-	* ext/socket/socket.c (s_recvfrom): ditto.
-
-	* hash.c (rb_hash_hash): should provide "hash" method where "eql?"
-	  is redefined.  [ruby-talk:122482]
-
-Sat Dec  4 14:54:52 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* eval.c (proc_invoke): use volatile `tmp' rather than `args'.
-	  [ruby-core:03882]
-
-Sat Dec  4 14:28:56 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/code_objects.rb (RDoc::Context::Section::set_comment):
-	  Section comments may now be bracketed by lines which are
-	  ignored. You can now write
-	      # -----------
-	      # :section: Dave's Section
-	      # comment material
-	      # -----------
-	   The lines before :section: are removed, and identical lines at the end are
-	   also removed if present.
-
-Sat Dec  4 03:33:45 2004  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* ext/readline/readline.c: check $SAFE. (backported from CVS HEAD)
-
-	* test/readline/test_readline.rb: added tests for readline.
-	  (backported from CVS HEAD)
-
-Sat Dec  4 02:24:00 2004  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf.c: add constant NKF::VERSION
-
-	* ext/nkf/nkf.c(guess): this becomes an alias of guess2
-
-	* ext/nkf/test.rb(mime_out2): add --no-cp932
-
-	* ext/nkf/nkf-utf8/nkf.c: original nkf2 revision 1.47
-
-Sat Dec  4 00:35:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (bsock_setsockopt): [ruby-dev:25039]
-
-Fri Dec  3 18:57:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/ostruct.rb: 1.9 marshaling support back-ported.
-	  [ruby-core:03871]
-
-Fri Dec  3 13:45:20 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_invoke): copy arguments to frame.argv.
-	  [ruby-core:03861]
-
-Fri Dec  3 12:25:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* st.h: fix prototypes.
-
-Fri Dec  3 00:21:05 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (convert_type): use rb_respond_to() again.
-	  [ruby-dev:25021]
-
-	* eval.c (rb_respond_to): funcall respond_to? if it's redefined.
-	  [ruby-dev:25021]
-
-Fri Dec  3 01:55:24 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: widget configuration by TkWindow#method_missing
-	  returns proper object. "widget.option = val" returns val, and
-	  "widget.option(val)" returns self.
-
-	* ext/tk/lib/tk/font.rb: TkFont#replace accepts only one font argument.
-
-	* ext/tk/lib/tk/radiobutton.rb: add TkRadiobutton#value and
-	  TkRadiobutton#value=(val).
-
-	* ext/tk/lib/tk/spinbox.rb: callback substitution support on
-	  command option.
-
-	* ext/tk/sample/demos-en/widget: bug fix (wrong image height)
-
-	* ext/tk/sample/demos-jp/widget: ditto.
-
-Fri Dec  3 00:11:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_file_initialize): [ruby-dev:25032]
-
-Thu Dec  2 16:41:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_protect): prevent continuations created inside from being
-	  called from the outside.  [ruby-dev:25003]
-
-	* eval.c (rb_callcc, rb_cont_call): prohibit calling from different
-	  signal contexts.  [ruby-dev:25022]
-
-Thu Dec  2 09:57:24 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/ostruct.rb (OpenStruct::Marshaler): OpenStruct can be
-	  marshaled again.  [ruby-core:03862]
-
-Thu Dec  2 09:30:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (thread_mark): mark thread group.  [ruby-dev:25020]
-
-	* eval.c (thgroup_add): check whether the argument is really a Thread.
-
-Thu Dec  2 07:57:16 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_ctl): [ruby-dev:25019]
-
-Wed Dec  1 02:21:02 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* signal.c (sighandler): call handler immediately only for default
-	  handlers.  [ruby-dev:25003]
-
-Tue Nov 30 23:38:18 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (io_fread): need not to null terminate.  [ruby-dev:24998]
-
-	* io.c (read_all): remove unnecessary rb_str_resize().
-	  [ruby-dev:24996]  (backported from CVS HEAD)
-
-	* io.c (io_readpartial): ditto.
-
-	* io.c (io_read): ditto.
-
-Tue Nov 30 16:18:50 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_fread): need not to null terminate.  [ruby-dev:24998]
-
-	* io.c (read_all): remove unnecessary rb_str_resize().
-	  [ruby-dev:24996]
-
-	* io.c (io_read): ditto.
-
-Tue Nov 30 00:49:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_sysread): use temporary lock.  [ruby-dev:24992]
-
-Mon Nov 29 16:06:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_write): insufficiently filled string
-	  being extended when overwriting.  [ruby-core:03836]
-
-Mon Nov 29 15:59:05 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/ostruct.rb (OpenStruct::method_missing): check method
-	  duplication for -d.
-
-	* lib/ostruct.rb (OpenStruct::initialize): ditto.
-
-Mon Nov 29 15:22:28 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/io/nonblock/test_flush.rb: abandon tests when io/nonblock is
-	  not supported.
-
-Mon Nov 29 03:08:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (convert_type): direct call conversion methods for the
-	  performance.  [ruby-core:03845]
-
-	* eval.c (rb_funcall_rescue): new function.
-
-	* object.c (rb_Array): avoid using rb_respond_to().
-
-	* object.c (rb_Integer): ditto.
-
-	* parse.y (reduce_nodes): empty body should return nil.
-
-	* string.c (rb_str_aset): the original string should not be
-	  affected by modifying duplicated string.  [ruby-dev:24981]
-
-Mon Nov 29 13:57:38 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (CreateChild): search executable file if no program
-	  name given. (backported from CVS HEAD)
-
-Mon Nov 29 13:37:54 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (fptr_finalize): must not use FILE after fclose().
-	  [ruby-dev:24985]
-
-Mon Nov 29 13:16:31 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (CreateChild): push back the last space before next
-	  loop because CharNext() eats it.
-
-Mon Nov 29 01:18:18 2004  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (rb_io_check_writable): call io_seek regardless of
-	  NEED_IO_SEEK_BETWEEN_RW.  [ruby-dev:24986]
-
-Sat Nov 27 21:43:39 2004  Tanaka Akira  <akr@m17n.org>
-
-	* io.c: avoid data lost with nonblocking fd and
-	  stdio buffering in sync mode.  [ruby-dev:24966]
-	  based on matz's patch [ruby-dev:24967]
-	  (io_fwrite): new primitive writing function which writes
-	  directly if sync mode.
-	  (rb_io_fwrite): wrapper for io_fwrite now.
-	  (io_write): call io_fwrite instead of rb_io_fwrite.
-
-Sat Nov 27 14:44:15 2004  Kent Sibilev  <ksibilev@bellsouth.net>
-
-	* lib/cgi/session.rb (CGI::Session::initialize): create_new_id is
-	  now a instance method.  [ruby-core:03832]
-
-Sat Nov 27 09:41:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_fread): old rb_io_fread with file closing checking.
-	  (rb_io_fread): wrapper for io_fread now.
-	  [ruby-dev:24964]
-
-Fri Nov 26 18:02:44 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: Tk.destroy uses TkWindow#epath
-
-	* ext/tk/lib/tk/image.rb: bug fix
-
-	* ext/tk/lib/tk/wm.rb: add 'iconphoto' method(Windows only)
-
-	* ext/tk/lib/tkextlib/*: some methods uses TkWindow#epath
-
-Fri Nov 26 13:49:06 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (method_missing): raise TypeError for classes do not
-	  have allocators.  [ruby-core:03752]
-
-	* lib/erb.rb: add RDoc by James Edward Gray II.  [ruby-core:03786]
-
-Fri Nov 26 13:29:02 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::look_for_directives_in): Break
-	  out of preprocessing when we find a :section: directive (previously cleared out the
-	  comment, but this apparently now generates an error in gsub!)
-
-Fri Nov 26 00:17:40 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_read): move StringValue() check before GetOpenFile().
-	  [ruby-dev:24959]
-
-Thu Nov 25 20:14:57 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/thwait.rb (ThreadsWait#join_nowait): abnormally terminated
-	  threads should be also processed.  [ruby-talk:121320]
-
-Thu Nov 25 10:14:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (push_braces): do not reuse buffer strings.  [ruby-core:03806]
-
-Thu Nov 25 07:59:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (read_all): stringify non-nil buffer argument, and always
-	  taint the result.  [ruby-dev:24955]
-
-Wed Nov 24 01:01:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_read): integer conversion should be prior to
-	  GetOpenFile().  [ruby-dev:24952]
-
-	* configure.in, io.c: cancel [ ruby-Patches-1074 ].
-
-Tue Nov 23 08:09:50 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/menu.rb: improve usability of TkOptionMenubutton
-
-Tue Nov 23 02:00:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_file_chown): integer conversion should be prior to
-	  GetOpenFile().  [ruby-dev:24949]
-
-Tue Nov 23 00:10:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_file_chown): integer conversion should be prior to
-	  GetOpenFile().  [ruby-dev:24947]
-
-	* file.c (rb_file_truncate): ditto.
-
-	* file.c (rb_file_s_truncate): ditto.
-
-	* dir.c (dir_seek): use NUM2OFFT().
-
-	* misc/ruby-mode.el (ruby-non-block-do-re): should not match words
-	  start with block keyword and underscore.  [ruby-core:03719]
-
-Mon Nov 22 22:33:02 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_require): Don't use names
-	  of variables or constants when oarsing 'require'
-
-Mon Nov 22 00:13:35 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (dir_seek): should retrieve dir_data after NUM2INT().
-	  [ruby-dev:24941]
-
-Sat Nov 20 23:57:33 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/README (et al): Add a new directive, :section:, and
-	  change the output format to accomodate. :section: allows to to
-	  group together methods, attributes, constants, etc under
-	  headings in the output. If used, a table of contents is
-	  generated.
-
-Sat Nov 20 23:56:54 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/options.rb (Options::parse): Force --inline-source if
-	  --one-file option given
-
-Sat Nov 20 23:55:19 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_splice): should place index wrapping after
-	  possible modification.  [ruby-dev:24940]
-
-Sat Nov 20 13:26:03 2004  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/utf8tbl.c: original revision 1.7
-
-Sat Nov 20 05:34:24 2004  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: original nkf.c rev:1.40
-
-	* ext/nkf/test.rb: add test for mime encode/decode
-
-Sat Nov 20 01:37:34 2004  Johan Holmberg  <holmberg@iar.se>
-
-	* eval.c (error_print): nicer traceback at interrupt.
-	  [ruby-core:03774]
-
-Sat Nov 20 00:07:16 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_gsub): internal buffer should not be listed by
-	  ObjectSpace.each_object() by String#gsub.  [ruby-dev:24931]
-
-Fri Nov 19 01:20:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi/session.rb (CGI::Session::FileStore::initialize): raise
-	  exception if data corresponding to session specified from the
-	  client does not exist.
-
-Fri Nov 19 00:59:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_gsub): internal buffer should not be listed by
-	  ObjectSpace.each_object().  [ruby-dev:24919]
-
-Thu Nov 18 18:41:08 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/ruby/test_stringchar.rb (test_bang): added.
-
-	* string.c (rb_str_upcase_bang, rb_str_capitalize_bang)
-	(rb_str_swapcase_bang): missing rb_str_modify().  [ruby-dev:24915]
-
-Thu Nov 18 00:21:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (proc_getpgrp): prohibit for $SAFE=2.
-	  [ruby-dev:24899]
-
-	* process.c (get_pid): ditto.  [ruby-dev:24904]
-
-	* process.c (get_ppid): ditto.
-
-	* array.c (rb_ary_delete): defer rb_ary_modify() until actual
-	  modification.  [ruby-dev:24901]
-
-Thu Nov 18 10:10:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c, rubyio.h (rb_io_modenum_flags): exported.
-
-	* ext/stringio/stringio.c (strio_initialize): allow Fixnum as mode as
-	  well as IO.new does.  [ruby-dev:24896]
-
-Wed Nov 17 23:42:40 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/ruby/test_settracefunc.rb: added.  [ruby-dev:24884]
-
-Wed Nov 17 13:56:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (newline_node): should not use FL_SET. [ruby-dev:24874]
-
-	* parse.y (string_content): should not use FL_UNSET.
-
-	* node.h (NODE_NEWLINE): remove unused bit to utilize flag field
-	  in nodes.
-
-Wed Nov 17 13:09:40 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* {bcc32,win32,wince}/Makefile.sub (test): should build ruby.exe
-	  before running test. [ruby-core:03756]
-
-Wed Nov 17 04:33:01 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* pack.c: all features are backport from 1.9. [ruby-dev:24826]
-
-	* bignum.c (rb_big2ulong_pack): new function to pack Bignums.
-
-Wed Nov 17 03:42:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_splice): move rb_str_modify() after
-	  StringValue(), which may alter the receiver.  [ruby-dev:24878]
-
-Tue Nov 16 23:45:07 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (flo_divmod): protect float values from GC by
-	  assignment to local variables.  [ruby-dev:24873]
-
-Tue Nov 16 16:30:21 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* {bcc32,win32,wince}/setup.mak (-epilogue-): remove config.h and
-	  config.status to force updating them.
-
-Tue Nov 16 16:20:45 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_read): position was ignored when a
-	  buffer was passed.  http://www.yo.rim.or.jp/~nov/d/?date=20041116#p03
-
-Tue Nov 16 11:19:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::options): use
-	  Regexp conversion.
-
-Tue Nov 16 01:41:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_mod_check): frozen check should be separated.
-	  [ruby-core:3742]
-
-	* array.c (rb_ary_update): pedantic check to detect
-	  rb_ary_to_ary() to modify the receiver.  [ruby-dev:24861]
-
-Mon Nov 15 13:50:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_justify): typo fixed.  [ruby-dev:24851]
-
-Mon Nov 15 11:50:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-special-char-p, ruby-parse-partial): handle
-	  operator symbols.  [ruby-talk:120177]
-
-Sun Nov 14 13:27:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/pp.rb (PP#object_address_group): remove odd number of 'f'
-	  prefixed to negative address.
-
-Sun Nov 14 08:51:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/logger/test_logger.rb: Logger just expects
-	  Logger#datetime_format to be used for Time#strftime independently of
-	  locale. [ruby-dev:24828]
-
-Fri Nov 12 15:03:26 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* eval.c (ruby_options): now we cannot call rb_glob() before
-	  ruby_init(), so call rb_w32_cmdvector() at ruby_options().
-
-	* win32.{c,h} (rb_w32_cmdvector): rename make_cmdvector() and
-	  export it.
-
-Fri Nov 12 14:08:01 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/event.rb: remove $LOADED_FEATURES trick
-
-	* ext/tk/lib/tk.rb: ditto
-
-Fri Nov 12 00:31:05 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/gdbm/gdbm.c (fgdbm_store): StringValue() may alter string
-	  pointer.  [ruby-dev:24783]
-
-Thu Nov 11 17:36:12 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (rb_globi): also should call back via rb_glob_caller().
-	  [ruby-dev:24775]
-
-Thu Nov 11 16:47:21 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_file.rb (test_truncate_wbuf): we want to test
-	  only File#truncate, not behaviour of seek(2).
-
-Thu Nov 11 09:41:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (push_braces): was confusing VALUE and char*.
-
-	* dir.c (rb_push_glob): Dir.glob should have called its block.
-
-Thu Nov 11 01:52:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (syserr_initialize): use stringified object.
-	  [ruby-dev:24768]
-
-Wed Nov 10 22:49:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/delegate.rb (SimpleDelegator::dup): wrong number of
-	  arguments.
-
-	* lib/delegate.rb (DelegateClass::dup): ditto.
-
-Wed Nov 10 12:31:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* README.EXT (Example): extconf.rb is indispensable now.
-
-Wed Nov 10 03:33:36 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: fix SEGV when compiled with Tcl/Tk8.3.x
-	  or older
-
-	* ext/tk/lib/tkextlib/tile/style.rb: bug fix
-
-Tue Nov  9 14:27:18 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser::Officious): moved from DefaultList.
-
-Tue Nov  9 01:05:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (rb_glob2): do not allocate buffer from heap to avoid
-	  memory leaks.  use string object for buffering instead.
-	  [ruby-dev:24738]
-
-	* dir.c (join_path): ditto.
-
-	* io.c (io_read): external input buffer may be modified even after
-	  rb_str_locktmp().  [ruby-dev:24735]
-
-	* dir.c (fnmatch): p or s may be NULL.  [ruby-dev:24749]
-
-Tue Nov  9 00:53:53 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* regex.c (slow_match): avoid GCC 3.4.x warnings.
-
-Tue Nov  9 00:50:06 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/rdoc.rb: Change version numbering of RDoc and ri
-
-Mon Nov  8 23:38:35 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/extservm.rb: add DRb::ExtServManager#uri=.
-	  [ruby-dev:24743]
-
-Mon Nov  8 22:20:19 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_class):
-	  Fix bug where parent class wasn't being detected if the
-	  child class was defined using the A::B notation.
-
-Mon Nov  8 00:14:13 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: add setup for mignw32 cross compiling.
-	  [ruby-talk:119413]
-
-Sun Nov  7 23:49:26 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: bind-event methods accept multi substitution
-	  arguments.
-
-	* ext/tk/lib/tk/canvas.rb: ditto.
-
-	* ext/tk/lib/tk/canvastag.rb: ditto.
-
-	* ext/tk/lib/tk/text.rb: ditto.
-
-	* ext/tk/lib/tk/texttag.rb: ditto.
-
-	* ext/tk/lib/tkextlib: ditto.
-
-Sat Nov  6 14:58:44 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/server.rb (WEBrick::HTTPServer#start): remove
-	  :DoNotReverseLookup option. (Socket#do_not_reverse_lookup is a
-	  ruby 1.9 feature)
-
-Sat Nov  6 11:31:04 2004  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb (_parse): checks whether zone was given.
-
 Sat Nov  6 00:46:27 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_locktmp): check STR_TMPLOCK flag before
@@ -8947,7 +5,7 @@ Sat Nov  6 00:46:27 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Fri Nov  5 18:12:42 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk/scrollable.rb: divide Scrollable module into
+	* ext/tk/lib/tk/scrollable.rb: divide Scrollable module into 
 	  X_Scrollable and Y_Scrollable
 
 	* ext/tk/lib/tk/entry.rb: include X_Scrollable instead of Scrollable
@@ -8971,10 +29,6 @@ Fri Nov  5 08:52:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* gc.c (gc_mark): stricter GC stack check.
 
-Fri Nov  5 08:52:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (gc_mark): stricter GC stack check.
-
 Fri Nov  5 08:34:43 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (str_gsub): should have removed rb_str_unlocktmp(str).
@@ -9009,7 +63,7 @@ Wed Nov  3 22:32:12 2004  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* process.c: On NetBSD don't use setruid() and setrgid().
 
-Wed Nov  3 22:24:17 2004  Daigo Moriwaki  <techml@sgtpepper.net>
+Wed Nov  3 22:24:17 2004  GOTOU Yuuzou <gotoyuzo@notwork.org>
 
 	* lib/webrick/httpauth/digestauth.rb: use Base64.encode64 to
 	  avoid warnings.
@@ -9029,12 +83,12 @@ Wed Nov  3 17:13:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 Wed Nov  3 16:58:07 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb: support to use different Tcl commands between
+	* ext/tk/lib/tk.rb: support to use different Tcl commands between 
 	  configure and configinfo
 
 	* ext/tk/lib/font.rb: ditto.
 
-	* ext/tk/lib/itemconfig.rb: support to use different Tcl commands
+	* ext/tk/lib/itemconfig.rb: support to use different Tcl commands 
 	  between item_configure and item_configinfo
 
 	* ext/tk/lib/itemfont.rb: ditto.
@@ -9052,7 +106,7 @@ Wed Nov  3 15:53:34 2004  Kouhei Sutou  <kou@cozmixng.org>
 	* test/rss/test_maker_*.rb: added tests for RSS Maker.
 
 	* lib/rss/maker.rb: added RSS Maker.
-
+	
 	* lib/rss/maker/*.rb: ditto.
 
 Tue Nov  2 16:35:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -9126,12 +180,6 @@ Fri Oct 29 10:00:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (ruby_cleanup): ruby_finalize_1 may cause exception,
 	  should be wrapped by PUSH_TAG/POP_TAG().  [ruby-dev:24627]
 
-Thu Oct 28 08:42:02 2004  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (argf_forward): use ANSI style.
-	  (argf_read): call argf_forward with argv argument.
-	  [ruby-dev:24624]
-
 Thu Oct 28 23:32:54 2004  akira yamada  <akira@ruby-lang.org>
 
 	* ext/zlib/zlib.c (zstream_detach_input): resets klass of z->input if
@@ -9238,11 +286,6 @@ Fri Oct 22 00:20:33 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* string.c (rb_str_include): should not treat char as negative value.
 	  [ruby-dev:24558]
 
-Thu Oct 21 21:32:30 2004  IWATSUKI Hiroyuki  <don@na.rim.or.jp>
-
-	* lib/pstore.rb (PStore#transaction): Use the empty content when a
-	  file is not found.  [ruby-dev:24561]
-
 Thu Oct 21 19:06:15 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#send_body_io):
@@ -9331,11 +374,6 @@ Mon Oct 18 15:58:01 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* range.c (range_step, range_each): need cast.
 
-Fri Oct 29 16:34:19 2004  Daiki Ueno  <ueno@unixuser.org>
-
-	* misc/ruby-mode.el (ruby-parse-partial): Parse the rest of the
-	line after opening heredoc identifier.  [ruby-dev:24635]
-
 Mon Oct 18 07:26:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_truncate): discard read buffer before truncation.
@@ -9382,14 +420,6 @@ Mon Oct 18 02:04:11 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	  do_not_reverse_lookup for each socket if :DoNotReverseLookup
 	  is set.  [ruby-core:02357]
 
-Mon Oct 18 00:42:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (sock_s_getservbyaname): protocol string
-	  might be altered.  [ruby-dev:24503]
-
-	* string.c (rb_str_upto): check if return value from succ is a
-	  string.  [ruby-dev:24504]
-
 Sun Oct 17 23:03:48 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/timer.rb: TkTimer#start and restart accept a block
@@ -9482,6 +512,14 @@ Thu Oct  7 12:55:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  switch. [ruby-dev:24442]
 
 	* pack.c (pack_unpack): string conversion should at the top of the
+Mon Oct 18 00:42:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_s_getservbyaname): protocol string
+	  might be altered.  [ruby-dev:24503]
+
+	* string.c (rb_str_upto): check if return value from succ is a
+	  string.  [ruby-dev:24504]
+
 	  method.  [ruby-dev:24439]
 
 	* io.c (io_read): buffer should be frozen only after the length
@@ -9571,7 +609,6 @@ Sat Oct  2 00:42:20 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  [ruby-dev:24383]
 
 	* string.c (rb_str_sum): string may be altered.  [ruby-dev:24381]
-
 Mon Oct 11 17:51:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* io.c (rb_io_popen): get mode string via rb_io_flags_mode() to
@@ -9590,6 +627,7 @@ Mon Oct 11 17:51:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  prevent access to recycled object (via continuation for
 	  example).  [ruby-dev:24463]
 
+
 Fri Oct  1 11:40:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_f_eval): defer pointer retrieval to prevent unsafe
@@ -9620,6 +658,11 @@ Fri Oct  1 11:25:20 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 Thu Sep 30 00:50:44 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
+Sat Oct  9 00:25:39 2004  Tanaka Akira  <akr@m17n.org>
+
+	* io.c (rb_io_fread): rb_thread_wait_fd() was lost.
+	  [ruby-dev:24457]
+
 	* ext/tcltklib/tcltklib.c (ip_init): bug fix
 
 	* ext/tk/tkutil.c (get_eval_string_core): accept a Regexp object
@@ -9917,11 +960,6 @@ Wed Sep  8 15:19:49 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/text.rb: add TkText#clear and erase
 
-Tue Sep  7 15:17:49 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/socket.c (ruby_connect): break immediately if a
-	  socket is non-blocking.  [ruby-talk:111654]
-
 Mon Sep  6 11:08:50 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/tk/lib/tk/menu.rb(TkOptionMenubutton#insert): call correct method
@@ -9930,7 +968,7 @@ Mon Sep  6 11:00:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* dir.c (dir_s_chdir): the patch to shut up false warning when
 	  exception occurred within a block.  a patch was given from Johan
-	  Holmberg <holmberg at iar.se>.  [ruby-core:03292]
+	  Holmberg <holmberg@iar.se>.  [ruby-core:03292]
 
 Mon Sep  6 07:51:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
@@ -10099,7 +1137,7 @@ Thu Aug 19 15:15:24 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* dir.c (free_dir): fix memory leak.  reported by yamamoto
 	  madoka.
 
-Thu Aug 19 11:00:00 2004  Akiyoshi, Masamichi  <masamichi.akiyoshi@hp.com>
+Thu Aug 20 11:00:00 2004 Akiyoshi, Masamichi <masamichi.akiyoshi@hp.com>
 
 	* dln.c (dln_load): Modify to call lib$find_image_symbol for VMS.
 	* io.c (rb_io_fwrite): Use fputc() for VMS non-stream file.
@@ -10457,6 +1495,10 @@ Wed Jul 14 12:29:07 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* test/ruby/test_float.rb (test_strtod): add test for bug fix.
 
+Wed Jul 14 01:18:45 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* array.c: rdoc patch - unified margin.
+
 Wed Jul 14 00:31:15 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* array.c: rdoc patch. merged patch from Johan Holmberg
@@ -10489,7 +1531,7 @@ Mon Jul 12 21:20:36 2004  Dave Thomas  <dave@pragprog.com>
 	* html_generator.rb: Support hyperlinks of the form {any text}[xxx]
 	  as well as stuff[xxx]
 
-Sat Jul 10 09:30:24 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sat Jul 10 09:30:24 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* test/soap/marshal/test_struct.rb: use qualified build-tin class name
 	  (::Struct) to avoid name crash.
@@ -10593,7 +1635,7 @@ Sun Jul  4 12:24:50 2004  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/rss.rb: added copyright header.
 
-Sun Jul  4 00:24:40 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sun Jul  4 00:24:40 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* added files
 	  * lib/soap/attachment.rb
@@ -10819,7 +1861,7 @@ Thu Jul  1 03:16:09 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/opnessl/lib/openssl/ssl.rb
 	  (OpenSSL::SSL::SocketForwarder#listen): fix typo.
 
-Wed Jun 30 11:38:51 2004  Mikael Brockman  <phubuh@phubuh.org>
+Wed Jun 30 11:38:51 2004  Mikael Brockman <phubuh@phubuh.org>
 
 	* parse.y (primary): should not be NULL.  [ruby-core:03098]
 
@@ -10976,7 +2018,7 @@ Sun Jun 13 00:23:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 	* ext/tcltklib/extconf.rb: [EXPERIMENTAL] MacOS X (darwin) support
 
 	* ext/tcltklib/tcltklib.c: fix thread trouble on callback proc, and
-	  eliminate warning about instance variable access
+	                   eliminate warning about instance variable access
 
 	* ext/tk/lib/tk/menubar.rb: improve supported menu_spec
 
@@ -11046,7 +2088,7 @@ Fri May 28 11:20:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (eval): reverted wrongly removed condition.  [ruby-dev:23638]
 
-Thu May 27 23:15:18 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu May 27 23:15:18 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* lib/logger.rb: leading 0 padding of timestamp usec part.
 
@@ -11063,7 +2105,7 @@ Thu May 27 23:15:18 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	  and a cell is represented as just a String or nil(NULL).  this
 	  change will cause widespread destruction.
 
-	      CSV.open("foo.csv", "r") do |row|
+      	      CSV.open("foo.csv", "r") do |row|
 		row.each do |cell|
 		  if cell.is_null       # using Cell#is_null
 		    p "(NULL)"
@@ -11265,11 +2307,11 @@ Mon May 17 01:15:23 2004  why the lucky stiff  <why@ruby-lang.org>
 	* test/yaml/test_yaml.rb (test_perl_regexp): updated test to
 	  match new regexp serialization.
 
-Mon May 17 00:03:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Mon May 17 00:03:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* lib/drb/drb.rb: Cosmetic documentation changes.
 
-Sun May 16 22:36:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sun May 16 22:36:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* lib/test/unit.rb: Removed :nodoc: directive (it prevented effective
 	  RDoc operation), and added file-level comment.
@@ -11281,7 +2323,7 @@ Sun May 16 20:55:49 2004  Tanaka Akira  <akr@m17n.org>
 	  (Init_dbm): define open flags: DBM::READER, DBM::WRITER, DBM::WRCREAT
 	  and DBM::NEWDB.
 
-Sun May 16 13:10:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sun May 16 13:10:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* lib/test/unit/**/*.rb: Removed :nodoc: directives (many were
 	  generating warnings, many were on private methods).
@@ -11385,7 +2427,7 @@ Mon May 10 12:11:37 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/generators/html_generator.rb: Hack to search parents
 	  for unqualified constant names.
 
-Sun May  9 22:37:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sun May  9 22:37:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* lib/net/ftp.rb: improved documentation
 	* lib/net/imap.rb: ditto
@@ -11447,11 +2489,11 @@ Wed May  5 03:40:29 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/ring.rb: use recv instead of recvfrom.
 
-Tue May  4 23:52:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Tue May  4 23:52:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* lib/gserver.rb: documented
 
-Tue May  4 23:46:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Tue May  4 23:46:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* lib/xmlrpc/README.txt: introduced for documentation purposes
 
@@ -11508,7 +2550,7 @@ Sat Apr 24 10:38:31 2004  Dave Thomas  <dave@pragprog.com>
 Fri Apr 23 23:26:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb: $hdrdir should not contain macros for backward
-	  compatibility.  [bruby-dev:28]
+	  compatibilitiy.  [bruby-dev:28]
 
 	* version.c (ruby_show_copyright): obtain copyright year from
 	  RUBY_RELEASE_YEAR.
@@ -11580,7 +2622,7 @@ Mon Apr 19 08:14:18 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_body): Allow for
 	  #ifdef HAVE_PROTOTYPES
 
-Fri Apr 16 22:33:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Fri Apr 16 22:33:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* ext/iconv/iconv.c: nearly finished RDoc comments.
 
@@ -11637,7 +2679,7 @@ Tue Apr 13 19:54:29 2004  Minero Aoki  <aamine@loveruby.net>
 	* lib/net/http.rb: should not overwrite HTTP request header.
 	  [ruby-list:39543]
 
-Tue Apr 13 01:30:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Tue Apr 13 01:30:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* ext/iconv/iconv.c: RDoc documentation (from RD; nearly finished).
 	* ext/iconv/charset_alias.rb: Prevent from RDoc'ing.
@@ -11783,7 +2825,7 @@ Thu Apr  1 22:55:04 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/ri/ri_options.rb: Fix undefined variable warning.
 
-Thu Apr  1 19:58:37 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Apr  1 19:58:37 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* lib/soap/mapping/{factory.rb,registry.rb}: fixed illegal mapped URI
 	  object with soap/marshal.
@@ -11861,7 +2903,7 @@ Thu Mar 25 02:00:18 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/generators/template/html/one_page_html.rb (Page):
 	  Fix to work with C modules.
 
-Wed Mar 24 21:17:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Wed Mar 24 21:17:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* lib/uri.rb: Documented (thanks Dmitry V. Sabanin).
 	* lib/uri/common.rb: Ditto.
@@ -11937,14 +2979,6 @@ Thu Mar 18 21:44:38 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/drb.rb: backport drb.rb 1.16.
 
-Fri Mar 18 17:49:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* struct.c (make_struct): allow const_id for accessor names.
-	  [ruby-core:04585]
-
-	* eval.c (rb_attr): check if attribute name is local_id or
-	  const_id.
-
 Thu Mar 18 16:22:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (proc_eq): avoid false positive by using scope and
@@ -12126,15 +3160,15 @@ Mon Feb 23 09:16:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* instruby.rb (DOSISH): embedded path in batch files should not be
 	  prefixed by DESTDIR.  [ruby-core:02186]
 
-Sun Feb 22 09:54:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sun Feb 22 09:54:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* re.c: corrected documentation format (again)
 
-Sun Feb 22 09:43:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sun Feb 22 09:43:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* re.c: corrected documentation format (rb_reg_initialize_m)
 
-Sat Feb 21 22:36:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sat Feb 21 22:36:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* ext/zlib/zlib.c: documented, but needs more effort.
 
@@ -12157,16 +3191,16 @@ Thu Feb 19 23:24:16 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/generators/html_generator.rb (Generators::HtmlClass::build_attribute_list):
 	  Support visibility modifiers for attributes
 
-Thu Feb 19 22:39:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Feb 19 22:39:04 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* test/rinda/test_rinda.rb: DRb.start_service only once in testsuites.
 	  DRb.start_service could handle this.
 
-Thu Feb 19 22:19:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Thu Feb 19 22:19:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* lib/ostruct.rb: documented
 
-Thu Feb 19 21:28:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Thu Feb 19 21:28:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* ext/strscan/strscan.c: improved documentation
 
@@ -12187,11 +3221,11 @@ Wed Feb 18 22:52:00 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/drb/unix.rb: remove O_NONBLOCK, thanks \ay
 
-Wed Feb 18 22:47:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Wed Feb 18 22:47:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* ext/strscan/strscan.c: documented
 
-Wed Feb 18 22:03:11 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed Feb 18 22:03:11 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* test/*: should not depend on $KCODE.
 
@@ -12209,7 +3243,7 @@ Tue Feb 17 23:40:34 2004  Guy Decoux  <ts@moulon.inra.fr>
 	* sprintf.c (rb_f_sprintf): preserve original val for
 	  format_integer. [ruby-talk:92975]
 
-Tue Feb 17 23:28:45 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Feb 17 23:28:45 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* test/ruby/marshaltestlib.rb: common marshal testcase added.
 
@@ -12252,11 +3286,11 @@ Tue Feb 17 00:14:30 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* vms/config.h_in: ditto.
 
-Mon Feb 16 23:28:14 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Mon Feb 16 23:28:14 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* lib/csv.rb: document reduction.  [ruby-core:02429]
 
-Mon Feb 16 22:08:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Mon Feb 16 22:08:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* lib/generator.rb: corrected doc format
 	* lib/rinda/rinda.rb: added documentation (from Hugh Sasse)
@@ -12308,11 +3342,11 @@ Fri Feb 13 12:35:08 2004  Minero Aoki  <aamine@loveruby.net>
 	* test/fileutils/test_fileutils.rb: File.link may raise EINVAL and
 	  EACCES on Windows.
 
-Thu Feb 12 21:45:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Thu Feb 12 21:45:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* lib/ftools.rb: documented
 
-Thu Feb 12 21:25:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Thu Feb 12 21:25:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* lib/base64.rb: backported from HEAD (modularised and documented)
 
@@ -12369,12 +3403,12 @@ Fri Feb  6 22:48:16 2004  Dave Thomas  <dave@pragprog.com>
 	* lib/rdoc/generators/html_generator.rb (gen_url): Support
 	  https in RDoc hyperlinks
 
-Fri Feb  6 22:41:22 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Feb  6 22:41:22 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* lib/pp.rb (PPInspectTest#test_to_s_with_iv): rollback the previous
 	  commit.  [ruby-dev:22813]
 
-Fri Feb  6 22:22:50 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Feb  6 22:22:50 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* lib/pp.rb (PPInspectTest#test_to_s_with_iv): remove instance
 	  variable which is defined in the test.
@@ -12439,11 +3473,11 @@ Mon Feb  2 01:54:00 2004  Tanaka Akira  <akr@m17n.org>
 	  (UDPSocket#send): recognize 3 arguments form.  try all addresses on
 	  4 arguments form.
 
-Sun Feb  1 18:17:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sun Feb  1 18:17:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* lib/net/http.rb: merged coding style changes from HEAD.
 
-Sun Feb  1 16:15:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sun Feb  1 16:15:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* lib/test/unit.rb: rearranged documentation for RDoc's sake.
 	* lib/matrix.rb: improved documentation.
@@ -12459,7 +3493,7 @@ Sat Jan 31 09:20:32 2004  NAKAMURA, Hiroshi  <nakahiro@sairon.co.jp>
 
 	* sample/openssl/gen_csr.rb: wrong usage string.
 
-Sat Jan 31 01:00:32 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sat Jan 31 01:00:32 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* lib/soap/wsdlDriver.rb, lib/wsdl/soap/operation.rb: add support of
 	  "parts" attribute of soap:body element in WSDL.
@@ -12674,7 +3708,7 @@ Wed Jan 14 13:31:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/iconv/extconf.rb: wrapper iconv.rb is dependent on platform.
 
-Tue Jan 13 18:54:28 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Jan 13 18:54:28 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* lib/logger.rb(Logger#msg2str): no special treatment for the object
 	  which responds to :to_str.  commited at 2004-01-11T21:46:27 by
@@ -12790,7 +3824,7 @@ Thu Jan  8 21:29:43 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_to_der): new function for
 	  OpenSSL::PKey::RSA#to_der.
 
-Thu Jan  8 16:51:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Jan  8 16:51:04 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* test/wsdl/datetime/test_datetime.rb: fixed a stupid testcase which
 	  dumps "E" at month-end.
@@ -12815,7 +3849,7 @@ Wed Jan  7 13:00:18 2004  Dave Thomas  <dave@pragprog.com>
 	  names (such as "ri Thread.join" would return both
 	  Thread.join and ThreadsWait.join)
 
-Wed Jan  7 12:35:41 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed Jan  7 12:35:41 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* lib/debug.rb: revert command parse regexps.  [ruby-list:39014] by
 	  Shirai,Kaoru.
@@ -13205,7 +4239,7 @@ Tue Dec 23 22:47:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* io.c (rb_io_check_writable): clear FMODE_RBUF before writing
 	  something.
 
-Tue Dec 23 22:25:00 2003  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Tue Dec 23 22:25:00 2003  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* lib/optparse.rb: incomplete RDoc documentation added in place of
 	  existing RD comments.  Tabs converted to spaces.
@@ -13229,7 +4263,7 @@ Tue Dec 23 18:09:40 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* pack.c (pack_pack): remove unnecessary negative value check.
 	  [ruby-dev:22329]
 
-Tue Dec 23 17:26:55 2003  KONISHI Hiromasa  <konishih@fd6.so-net.ne.jp>
+Tue Dec 23 17:26:55 2003  KONISHI Hiromasa   <konishih@fd6.so-net.ne.jp>
 
 	* bcc32/Makefile.sub (config.h): bcc has finite(). [ruby-list:38940]
 
@@ -14032,7 +5066,7 @@ Tue Dec  2 21:31:42 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/runner.rb: exit with the test result.
 
-Tue Dec  2 20:18:48 2003  Eric Sunshine  <sunshine@sunshineco.com>
+Tue Dec  2 20:18:48 2003  Eric Sunshine <sunshine@sunshineco.com>
 
 	* configure.in (AC_PROG_YACC): AC_DEFINE(OLD_YACC) if Yacc is found
 	  instead of Bison or byacc.
@@ -14095,7 +5129,7 @@ Mon Dec  1 14:17:49 2003  Minero Aoki  <aamine@loveruby.net>
 	* test/fileutils/test_fileutils.rb: does much strict test on
 	  "same" files detecting.
 
-Mon Dec  1 09:28:14 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Dec  1 09:28:14 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
 	  (XCFLAGS): re-export $(XCFLAGS).
@@ -14179,7 +5213,7 @@ Fri Nov 28 19:37:56 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* test/ruby/test_env.rb (test_has_value, test_index): condition for
 	  aboves.
 
-Fri Nov 28 17:59:20 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Nov 28 17:59:20 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* test/ruby/test_env.rb: add tests for ENV.
 
@@ -14265,7 +5299,7 @@ Wed Nov 26 00:55:30 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* lib/webrick/httpserver.rb (HTTPServer#run): should pass the
 	  request's keep_alive flag to the response.
 
-Tue Nov 25 21:41:35 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Nov 25 21:41:35 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* defines.h (ENV_IGNORECASE): should define when DOSISH without
 	  human68k. [ruby-dev:22047]
@@ -14406,7 +5440,7 @@ Mon Nov 24 17:00:00 2003  Tanaka Akira  <akr@m17n.org>
 	* lib/open-uri.rb: validate option names.
 	  :content_length_proc and :progress_proc option implemented.
 
-Mon Nov 24 14:53:10 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Nov 24 14:53:10 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
 	  (XCFLAGS): output empty value instead of `-DRUBY_EXPORT'.
@@ -14429,12 +5463,12 @@ Sat Nov 22 22:48:46 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c: add native thread check
 
-Sat Nov 22 18:49:47 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Nov 22 18:49:47 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* ext/curses/curses.c (window_nodelay): nodelay() of NetBSD's
 	  libcruses returns no value, just like keypad().
 
-Sat Nov 22 17:36:36 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Nov 22 17:36:36 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
 	  (HAVE_GETCWD): output to config.h.
@@ -14543,7 +5577,7 @@ Wed Nov 19 14:32:08 2003  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb (cannot_overwrite_file?): add wince.
 
-Wed Nov 19 11:04:47 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Nov 19 11:04:47 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* lib/fileutils.rb (cannot_overwrite_file?, have_st_ino?): bccwin32
 	  is same as mswin32.
@@ -14658,7 +5692,7 @@ Sun Nov 16 12:16:10 2003  Minero Aoki  <aamine@loveruby.net>
 	* lib/net/protocol.rb: logging response body. [experimental]
 	  [ruby-list:38800]
 
-Sun Nov 16 10:49:38 2003  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sun Nov 16 10:49:38 2003  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* lib/thread.rb (Thread.exclusive): wrap method definition in
 	  class Thread to enable rdoc to process.
@@ -14831,7 +5865,7 @@ Sat Nov  8 13:49:50 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* configure.in: improvement of pthread check
 
-Sat Nov  8 13:28:46 2003  Takaaki Tateishi  <ttate@ttsky.net>
+Sat Nov  8 13:28:46 2003 Takaaki Tateishi <ttate@ttsky.net>
 	* ext/dl/sym.c: Add DL.win32_last_error and DL.last_error.
 	  Thanks, Kaoru Shirai.
 
@@ -14934,7 +5968,7 @@ Wed Nov  5 17:05:18 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/test/unit/ui/gtk/testrunner.rb: typo.
 
-Wed Nov  5 11:13:32 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Nov  5 11:13:32 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* string.c: add #include "version.h". this file still depends on it.
 
@@ -14955,7 +5989,7 @@ Wed Nov  5 08:39:51 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/openssl/ossl_ssl.c (ossl_ssl_get_peer_cert_chain): return nil
 	  if no cert-chain was given.
 
-Tue Nov  4 23:44:48 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Nov  4 23:44:48 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub:
 	  remove needless version.h dependency.
@@ -15061,7 +6095,7 @@ Fri Oct 31 12:55:24 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* bcc32/Makefile.sub, win32/Makefile.sub, win32/Makefile.sub: ditto.
 
-Fri Oct 31 01:38:14 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Oct 31 01:38:14 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* wince/Makefile.sub, win32/Makefile.sub (.y.c): allow white spaces
 	  at the beginning of line to remove by sed. (ruby-bugs-ja:PR#580)
@@ -15120,7 +6154,7 @@ Thu Oct 30 10:14:51 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* lib/test/unit/autorunner.rb: make fox runner work.
 
-Thu Oct 30 09:32:26 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Oct 30 09:32:26 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* process.c (rb_f_system): fixed lack of security check before
 	  calling do_spawn() on win32. [ruby-talk:84555]
@@ -15149,7 +6183,7 @@ Wed Oct 29 22:02:04 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	* test/drb/drbtest.rb: use rbconfig.rb to make the path of ruby
 	  interpreter to exec, instead of test/ruby/envutil.rb,
 
-Wed Oct 29 19:58:59 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Oct 29 19:58:59 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* ext/tcltklib/tcltklib.c (CONST84): define CONST84 when it is not
 	  defined and TCL_MAJOR_VERSION >= 8.
@@ -15181,7 +6215,7 @@ Wed Oct 29 11:27:39 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* parse.y (ret_args): node may be NULL. [ruby-talk:84530]
 
-Tue Oct 28 15:20:12 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Oct 28 15:20:12 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* ext/tcltklib/tcltklib.c (VwaitVarProc, ip_rbVwaitObjCmd,
 	  WaitVariableProc, WaitVisibilityProc, WaitWindowProc,
@@ -15263,7 +6297,7 @@ Tue Oct 21 15:57:11 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
 	  prepend the directory of target file to the load path.
 
-Tue Oct 21 15:08:53 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Oct 21 15:08:53 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* win32/win32.c (do_spawn, do_aspawn): should wait child process even
 	  if callded with P_OVERLAY.
@@ -15316,7 +6350,7 @@ Mon Oct 20 11:00:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* gc.c (gc_sweep): do not update malloc_limit when malloc_increase
 	  is smaller than malloc_limit.
 
-Mon Oct 20 09:45:12 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Oct 20 09:45:12 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* lib/debug.rb (debug_command): remove debug print.
 
@@ -15370,7 +6404,7 @@ Fri Oct 17 22:16:42 2003  Akinori MUSHA  <knu@iDaemons.org>
 	* lib/set.rb: It is not necessary to require
 	  'test/unit/ui/console/testrunner'.
 
-Fri Oct 17 11:15:22 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Oct 17 11:15:22 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* test/ruby/test_range.rb: added.
 
@@ -15437,7 +6471,7 @@ Wed Oct 15 15:00:54 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* eval.c (ruby_run): just return FAILURE instead of parse error
 	  count.  [ruby-list:38569]
 
-Wed Oct 15 13:17:02 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Oct 15 13:17:02 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* ext/digest/digest.c (rb_digest_base_alloc): need to initialize
 	  buffer. [ruby-dev:21622]
@@ -15450,7 +6484,7 @@ Wed Oct 15 11:23:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  modules before invoking marshal_load.  these two fixes are done
 	  by Masatoshi Seki <m_seki@mva.biglobe.ne.jp>.
 
-Wed Oct 15 09:30:34 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Oct 15 09:30:34 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* ext/enumerator/enumerator.c (enumerator_each): avoid VC++ warning.
 
@@ -15717,7 +6751,7 @@ Thu Oct  9 06:43:33 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* eval.c (rb_thread_start_0, rb_thread_raise, rb_callcc): save
 	  variables across THREAD_SAVE_CONTEXT.
 
-Thu Oct  9 12:05:46 2003  Eric Sunshine  <sunshine@sunshineco.com>
+Thu Oct  9 12:05:46 2003  Eric Sunshine <sunshine@sunshineco.com>
 
 	* configure.in: revived NextStep, OpenStep, and Rhapsody ports which
 	  had become unbuildable; enhanced --enable-fat-binary option so that
@@ -16136,7 +7170,7 @@ Fri Oct  3 16:13:19 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/openssl/ossl_x509attr.c (ossl_x509attr_get_value): return
 	  DER encoded data in OpenSSL::ASN1 types.
 
-Fri Oct  3 13:02:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Fri Oct  3 13:02:00 2003  Nathaniel Talbott <ntalbott@ruby-lang.org>
 
 	* lib/test/unit.rb: refactored to use optparse.
 
@@ -16159,7 +7193,7 @@ Fri Oct  3 08:14:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* lib/irb/ruby-lex.rb (RubyLex::identify_identifier): support
 	  'class ::Foo' syntax. [ruby-talk:83514]
 
-Fri Oct  3 08:01:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Fri Oct  3 08:01:00 2003  Nathaniel Talbott <ntalbott@ruby-lang.org>
 
 	* lib/test/unit/assertions.rb: added a default message for #assert,
 	  #assert_block, and #flunk.
@@ -16255,7 +7289,7 @@ Thu Oct  2 11:17:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
 
 	* lib/test/unit/collector/objectspace.rb: ditto.
 
-Thu Oct  2 03:25:01 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Oct  2 03:25:01 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* eval.c (rb_thread_raise): prototype; avoid VC++ warning.
 
@@ -16368,11 +7402,11 @@ Wed Oct  1 17:01:30 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* eval.c (rb_load): Object scope had priority over required file
 	  scope.  [ruby-dev:21415]
 
-Wed Oct  1 14:09:53 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+Wed Oct 01 14:09:53 2003  Takaaki Uematsu <uema2x@jcom.home.ne.jp>
 
 	* wince/mkconfig_wce.rb: sorry, forget to commit.
 
-Wed Oct  1 10:08:42 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+Wed Oct 01 10:08:42 2003  Takaaki Uematsu <uema2x@jcom.home.ne.jp>
 
 	* wince/setup.mak: add sigmarionIII SDK support.
 
@@ -16382,7 +7416,7 @@ Wed Oct  1 10:08:42 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
 
 	* wince/mkconfig_wce.rb: camouflage RUBY_PLATFORM for compiling ext.
 
-Wed Oct  1 08:02:52 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+Wed Oct 01 08:02:52 2003  Takaaki Uematsu <uema2x@jcom.home.ne.jp>
 
 	* wince/time_wce.c (time): add zero check.
 
@@ -16529,7 +7563,7 @@ Sat Sep 27 03:32:37 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 	  test/soap/marshal/test_marshal.rb crashed with
 	  test/ruby/test_marshal.rb.
 
-Sat Sep 27 01:30:59 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Sep 27 01:30:59 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* ext/socket/socket.c (ruby_connect): on win32, type of the 4th
 	  argument of getsockopt is char *.
@@ -16554,7 +7588,7 @@ Fri Sep 26 00:10:13 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* lib/README: updated.
 
-Thu Sep 25 17:48:10 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Sep 25 17:48:10 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* ext/openssl/ossl.c (ossl_buf2str): fix type of 1st argument for
 	  rb_protect.
@@ -16562,7 +7596,7 @@ Thu Sep 25 17:48:10 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
 	* ext/openssl/ossl_hmac.c (ossl_hmac_digest): should return meaningful
 	  value.
 
-Thu Sep 25 09:00:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Thu Sep 25 09:00:00 2003  Nathaniel Talbott <ntalbott@ruby-lang.org>
 
 	* lib/ostruct.rb: Added OpenStruct#==.
 
@@ -16645,7 +7679,7 @@ Sat Sep 20 11:49:05 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/logger/test_logger.rb: new file.
 
-Fri Sep 19 11:39:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Fri Sep 19 11:39:00 2003  Nathaniel Talbott <ntalbott@ruby-lang.org>
 
 	* test/testunit/*: Added.
 
@@ -16786,7 +7820,7 @@ Mon Sep 15 19:02:52 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/csv/mac.csv: added.  Sample CR separated CSV file.
 
-Fri Sep 12 22:41:48 2003  Michal Rokos  <m.rokos@sh.cvut.cz>
+Fri Sep 12 22:41:48 2003 Michal Rokos <m.rokos@sh.cvut.cz>
 
 	* ext/openssl/ossl.c: move ASN.1 stuff to ossl_asn1.[ch]
 
@@ -16810,7 +7844,7 @@ Fri Sep 12 12:09:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* bignum.c (rb_big_xor): ditto.
 
-Fri Sep 12 07:06:14 2003  David Black  <dblack@superlink.net>
+Fri Sep 12 07:06:14 2003   David Black <dblack@superlink.net>
 
 	* lib/scanf.rb: Took out useless @matched_item variable; some small
 	  refactoring.
@@ -16835,7 +7869,7 @@ Wed Sep 10 22:47:30 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/openssl/ossl_config.c (set_conf_section_i): should check
 	  if the argument is Array.
 
-Wed Sep 10 22:41:54 2003  Tietew  <tietew@tietew.net>
+Wed Sep 10 22:41:54 2003  Tietew <tietew@tietew.net>
 
 	* eval.c (win32_get_exception_list): avoid VC7 warning.
 	  [ruby-win32:577]
@@ -16853,7 +7887,7 @@ Tue Sep  9 05:17:04 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_config.rb: avoid compile error in OpenSSL-0.9.6.
 
-Tue Sep  9 02:41:35 2003  Michal Rokos  <m.rokos@sh.cvut.cz>
+Tue Sep 9 02:41:35 2003 Michal Rokos <m.rokos@sh.cvut.cz>
 
 	* ext/openssl/ossl_config.c: Refine compatibility.
 
@@ -16923,7 +7957,7 @@ Sat Sep  6 02:26:34 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 	* test/ruby/test_*.rb: assert_same, assert_match, and so on.
 
-Sat Sep  6 18:45:46 2003  Mauricio Fernandez  <batsman.geo@yahoo.com>
+Sat Sep  6 18:45:46 2003  Mauricio Fernandez <batsman.geo@yahoo.com>
 
 	* parse.y (assignable): call rb_compile_error(), not rb_bug().
 	  [ruby-core:01523]
@@ -16942,7 +7976,7 @@ Sat Sep  6 17:40:41 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* ext/openssl/ossl_x509ext.c (X509::Extension#critical=): new method.
 
-Sat Sep  6 01:23:22 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Sep  6 01:23:22 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* win32/win32.c (CreateChild): need to quote cmd if RUBYSHELL is set.
 
@@ -17223,12 +8257,12 @@ Sat Aug 30 03:58:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (rb_yield_0): stop TAG_RETURN/TAG_BREAK escaping.
 
-Fri Aug 29 22:35:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+Fri Aug 29 22:35:00 2003  Shigeo Kobayashi <shigek@ruby-lang.org>
 
 	* bigdecimal.c *.html: The 2nd arg. for add,sub,mult, and div is 0,
 	  then result will be the same as +,-,*,/ respectively.
 
-Fri Aug 29 17:30:15 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri Aug 29 17:30:15 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* process.c: bug fix
 
@@ -17303,7 +8337,7 @@ Wed Aug 27 15:07:57 2003  Minero Aoki  <aamine@loveruby.net>
 	* lib/net/smtp.rb (check_response): AUTH CRAM-MD5 returns 334
 	  response. [ruby-list:38279]
 
-Wed Aug 27 05:10:15 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Aug 27 05:10:15 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* win32/win32.c (map_errno): support winsock error.
 
@@ -17352,7 +8386,7 @@ Sat Aug 23 18:56:53 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* ext/nkf/nkf.c (rb_nkf_putchar): should use rb_str_resize() to just
 	  resize a string, rb_str_cat() disallows NULL.  [ruby-dev:21237]
 
-Sat Aug 23 16:48:41 2003  Keiju Ishitsuka  <keiju@ishitsuka.com>
+Sat Aug 23 16:48:41 2003  Keiju Ishitsuka <keiju@ishitsuka.com>
 
 	* lib/irb/ruby-lex.rb: bug fix for "foo" !~ /bar/. [ruby-talk:79942]
 
@@ -17377,7 +8411,7 @@ Fri Aug 22 17:07:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* string.c (rb_str_scan): use rb_yield_splat().
 
-Fri Aug 22 06:13:22 2003  why the lucky stiff  <why@ruby-lang.org>
+Fri Aug 22 06:13:22 2003  why the lucky stiff <why@ruby-lang.org>
 
 	* ext/syck/rubyext.c: refactoring of the transfer method
 	  dispatch.  added yaml_org_handler for faster dispatch of
@@ -17565,7 +8599,7 @@ Fri Aug 15 02:08:53 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* gc.c (id2ref): recycle check should be done by klass == 0.
 	  [ruby-core:01408]
 
-Fri Aug 15 01:34:23 2003  Michal Rokos  <m.rokos@sh.cvut.cz>
+Fri Aug 15 01:34:23 2003 Michal Rokos <m.rokos@sh.cvut.cz>
 
 	* ext/openssl/ossl_pkey.c: move generate_cb here
 
@@ -17597,7 +8631,7 @@ Thu Aug 14 20:03:34 2003  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 	* ext/win32ole/win32ole.c (ole_initialize): stop calling
 	  OleUninitialize at exit.
 
-Thu Aug 14 11:27:37 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Aug 14 11:27:37 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* gc.c (rb_data_object_alloc): check type of 1st argument.
 	  [ruby-dev:21192]
@@ -17636,7 +8670,7 @@ Wed Aug 13 15:58:31 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 	* object.c (rb_class_s_alloc): add function prototype to avoid VC++
 	  warning.
 
-Wed Aug 13 13:50:59 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Aug 13 13:50:59 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* ext/Win32API/Win32API.c (Win32API_initialize): should pass some
 	  class to first argument of Data_Wrap_Struct(). (ruby-bugs:PR#1109)
@@ -17795,7 +8829,7 @@ Wed Aug  6 17:23:57 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c: initialize /* OK */ variables by Qnil to stop warnings.
 
-Wed Aug  6 04:58:32 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Aug  6 04:58:32 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 	* ext/Setup*: add io/wait and openssl.
 
diff --git a/LEGAL b/LEGAL
index 908eb270f5..dce7c1acbf 100644
--- a/LEGAL
+++ b/LEGAL
@@ -134,12 +134,14 @@ st.[ch]:
 x68/*:
 missing/alloca.c:
 missing/dup2.c:
+missing/erf.c:
 missing/finite.c:
 missing/hypot.c:
 missing/isinf.c:
 missing/isnan.c:
 missing/memcmp.c:
 missing/memmove.c:
+missing/mkdir.c:
 missing/strcasecmp.c:
 missing/strchr.c:
 missing/streror.c:
@@ -184,8 +186,6 @@ missing/strtoul.c:
     software for any purpose.  It is provided "as is" without
     express or implied warranty.
 
-missing/erf.c:
-missing/crypt.c:
 missing/vsnprintf.c:
 
   This file is under the old-style BSD license.  Note that the
@@ -205,7 +205,11 @@ missing/vsnprintf.c:
     2. Redistributions in binary form must reproduce the above copyright
        notice, this list of conditions and the following disclaimer in the
        documentation and/or other materials provided with the distribution.
-    3. Neither the name of the University nor the names of its contributors
+    3. All advertising materials mentioning features or use of this software
+       must display the following acknowledgement:
+         This product includes software developed by the University of
+         California, Berkeley and its contributors.
+    4. Neither the name of the University nor the names of its contributors
        may be used to endorse or promote products derived from this software
        without specific prior written permission.
 
@@ -305,20 +309,17 @@ ext/digest/sha2/sha2hl.c:
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-ext/nkf/nkf-utf8/config.h:
-ext/nkf/nkf-utf8/nkf.c:
-ext/nkf/nkf-utf8/utf8tbl.c:
+ext/nkf/nkf1.7/nkf.c:
 
-  These files are under the following license.  So to speak, it is
+  This file is under the following license.  So to speak, it is
   copyrighted semi-public-domain software.
 
     Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA)
        Everyone is permitted to do anything on this program 
-       including copying, modifying, improving,
+       including copying, modifying, improving.
        as long as you don't try to pretend that you wrote it.
        i.e., the above copyright notice has to appear in all copies.
-       Binary distribution requires original version messages.
-       You don't have to ask before copying, redistribution or publishing.
+       You don't have to ask before copying or publishing.
        THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE.
 
 ext/socket/addrinfo.h:
diff --git a/Makefile.in b/Makefile.in
index 254f1656ee..663ba43111 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,7 +10,6 @@ YACC = @YACC@
 PURIFY =
 AUTOCONF = autoconf
 @SET_MAKE@
-MKFILES = @MAKEFILES@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -18,21 +17,10 @@ bindir = @bindir@
 sbindir = @sbindir@
 libdir = @libdir@
 libexecdir = @libexecdir@
-datarootdir = @datarootdir@
-datadir = @datadir@
 arch = @arch@
 sitearch = @sitearch@
 sitedir = @sitedir@
 
-TESTUI = console
-TESTS =
-RDOCTARGET = @RDOCTARGET@
-
-EXTOUT = @EXTOUT@
-RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
-
-empty =
-OUTFLAG = @OUTFLAG@$(empty)
 CFLAGS = @CFLAGS@ @XCFLAGS@ @ARCH_FLAG@
 CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
@@ -45,7 +33,6 @@ LDSHARED = @LIBRUBY_LDSHARED@
 DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
 SOLIBS = @SOLIBS@
 MAINLIBS = @MAINLIBS@
-MINIOBJS = @MINIOBJS@
 
 RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
 RUBY_SO_NAME=@RUBY_SO_NAME@
@@ -53,7 +40,6 @@ EXEEXT = @EXEEXT@
 PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
 RUBY = $(RUBY_INSTALL_NAME)
 MINIRUBY = @MINIRUBY@
-RUNRUBY = @RUNRUBY@
 
 #### End of system configuration section. ####
 
@@ -69,55 +55,135 @@ LIBRUBYARG    = @LIBRUBYARG@
 LIBRUBYARG_STATIC = @LIBRUBYARG_STATIC@
 LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
 
-PREP          = @PREP@
-ARCHFILE      = @ARCHFILE@
+PREP          = @PREP@ @ARCHFILE@
 SETUP         =
 EXTSTATIC     = @EXTSTATIC@
 
-RM            = rm -f
-NM            = @NM@
-AR            = @AR@
-ARFLAGS       = rcu
-RANLIB        = @RANLIB@
-AS            = @AS@
-ASFLAGS       = @ASFLAGS@
+EXTOBJS	      = 
+DLDOBJS	      = $(DMYEXT)
+DMYEXT	      = dmyext.@OBJEXT@
+
+MAINOBJ	      = main.@OBJEXT@
+
+OBJS	      = array.@OBJEXT@ \
+		bignum.@OBJEXT@ \
+		class.@OBJEXT@ \
+		compar.@OBJEXT@ \
+		dir.@OBJEXT@ \
+		dln.@OBJEXT@ \
+		enum.@OBJEXT@ \
+		error.@OBJEXT@ \
+		eval.@OBJEXT@ \
+		file.@OBJEXT@ \
+		gc.@OBJEXT@ \
+		hash.@OBJEXT@ \
+		inits.@OBJEXT@ \
+		io.@OBJEXT@ \
+		marshal.@OBJEXT@ \
+		math.@OBJEXT@ \
+		numeric.@OBJEXT@ \
+		object.@OBJEXT@ \
+		pack.@OBJEXT@ \
+		parse.@OBJEXT@ \
+		process.@OBJEXT@ \
+		prec.@OBJEXT@ \
+		random.@OBJEXT@ \
+		range.@OBJEXT@ \
+		re.@OBJEXT@ \
+		regex.@OBJEXT@ \
+		ruby.@OBJEXT@ \
+		signal.@OBJEXT@ \
+		sprintf.@OBJEXT@ \
+		st.@OBJEXT@ \
+		string.@OBJEXT@ \
+		struct.@OBJEXT@ \
+		time.@OBJEXT@ \
+		util.@OBJEXT@ \
+		variable.@OBJEXT@ \
+		version.@OBJEXT@ \
+		$(MISSING)
 
-OBJEXT        = @OBJEXT@
 MANTYPE	      = @MANTYPE@
 
-PREINSTALL    = @PREINSTALL@
-#### End of variables
+SCRIPT_ARGS   =	--dest-dir="$(DESTDIR)" \
+		--make="$(MAKE)" \
+		--mflags="$(MFLAGS)" \
+		--make-flags="$(MAKEFLAGS)"
 
-all:
+all:		@MAKEFILES@ miniruby$(EXEEXT) rbconfig.rb $(LIBRUBY)
+		@$(MINIRUBY) $(srcdir)/ext/extmk.rb --extstatic="$(EXTSTATIC)" $(SCRIPT_ARGS)
 
-.DEFAULT: all
+miniruby$(EXEEXT):	config.status $(LIBRUBY_A) $(MAINOBJ) $(DMYEXT)
+		@rm -f $@
+		$(PURIFY) $(CC) $(LDFLAGS) $(MAINLIBS) $(MAINOBJ) $(DMYEXT) $(LIBRUBY_A) $(LIBS) -o $@
 
-# Prevent GNU make v3 from overflowing arg limit on SysV.
-.NOEXPORT:
-
-miniruby$(EXEEXT):
-		@$(RM) $@
-		$(PURIFY) $(CC) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(MAINLIBS)
-
-$(PROGRAM):
-		@$(RM) $@
-		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG)$@
+$(PROGRAM):     $(LIBRUBY) $(MAINOBJ) $(EXTOBJS) $(SETUP) miniruby$(EXEEXT)
+		@rm -f $@
+		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
 
 # We must `rm' the library each time this rule is invoked because "updating" a
 # MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not
 # supported.
-$(LIBRUBY_A):
-		@$(RM) $@
-		$(AR) $(ARFLAGS) $@ $(OBJS) $(DMYEXT)
-		@-$(RANLIB) $@ 2> /dev/null || true
+$(LIBRUBY_A):	$(OBJS) $(DMYEXT)
+		@rm -f $@
+		@AR@ rcu $@ $(OBJS) $(DMYEXT)
+		@-@RANLIB@ $@ 2> /dev/null || true
 
-$(LIBRUBY_SO):
-		$(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@
+$(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) miniruby$(EXEEXT) $(PREP)
+		$(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) -o $@
 		@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
 						  File.symlink "$(LIBRUBY_SO)", link}' \
 				$(LIBRUBY_ALIASES) || true
 
-fake.rb:	Makefile
+ruby.imp:	$(LIBRUBY_A)
+		@@NM@ -Pgp $(LIBRUBY_A) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
+# $(MINIRUBY) $< $@
+
+install:	install-nodoc @RDOCTARGET@
+
+install-nodoc:	rbconfig.rb
+		$(MINIRUBY) $(srcdir)/instruby.rb $(SCRIPT_ARGS) --mantype="$(MANTYPE)"
+		$(MINIRUBY) $(srcdir)/ext/extmk.rb $(SCRIPT_ARGS) install
+
+what-where no-install:	rbconfig.rb
+		$(MINIRUBY) $(srcdir)/instruby.rb -n $(SCRIPT_ARGS) --mantype="$(MANTYPE)"
+		$(MINIRUBY) $(srcdir)/ext/extmk.rb -n $(SCRIPT_ARGS) install
+
+install-doc:
+		@echo Generating RDoc documentation
+		$(bindir)/$(PROGRAM) $(srcdir)/bin/rdoc --all --ri-system $(srcdir)
+
+clean-ext:
+		@-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(SCRIPT_ARGS) clean 2> /dev/null || true
+
+clean-local:
+		@rm -f $(OBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY_ALIASES)
+		@rm -f ext/extinit.c ext/extinit.@OBJEXT@ dmyext.@OBJEXT@
+		@rm -f $(PROGRAM) miniruby$(EXEEXT)
+
+clean: clean-ext clean-local
+
+distclean-ext:
+		@-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(SCRIPT_ARGS) distclean 2> /dev/null || true
+
+distclean-local: clean-local
+		@rm -f @MAKEFILES@ config.h rbconfig.rb
+		@rm -f ext/config.cache config.cache config.log config.status
+		@rm -f *~ core *.core gmon.out y.tab.c y.output ruby.imp
+
+distclean: distclean-ext distclean-local
+
+realclean: 	distclean
+		@rm -f parse.c
+		@rm -f lex.c
+
+test:		miniruby$(EXEEXT) rbconfig.rb $(PROGRAM) PHONY
+		@./miniruby$(EXEEXT) $(srcdir)/rubytest.rb
+
+rbconfig.rb:	miniruby$(EXEEXT) $(srcdir)/mkconfig.rb config.status $(PREP)
+		@$(MINIRUBY) $(srcdir)/mkconfig.rb rbconfig.rb
+
+fake.rb:	miniruby$(EXEEXT) Makefile
 		@echo ' \
 		class Object; \
 		  CROSS_COMPILING = RUBY_PLATFORM; \
@@ -136,7 +202,13 @@ fake.rb:	Makefile
 
 Makefile:	$(srcdir)/Makefile.in
 
-$(MKFILES): config.status $(srcdir)/common.mk
+.PRECIOUS:	@MAKEFILES@
+
+.PHONY:		test install install-nodoc install-doc
+
+PHONY:
+
+@MAKEFILES@: config.status
 		MAKE=$(MAKE) $(SHELL) ./config.status
 		@{ \
 		    echo "all:; -@rm -f conftest.mk"; \
@@ -152,8 +224,11 @@ config.status:	$(srcdir)/configure
 $(srcdir)/configure: $(srcdir)/configure.in
 		cd $(srcdir) && $(AUTOCONF)
 
+.c.@OBJEXT@:
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+
 lex.c: keywords
-	@-$(RM) $@
+	@-rm -f $@
 	gperf -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@ || \
 	cp "$(srcdir)/$@" .
 
@@ -162,17 +237,144 @@ lex.c: keywords
 	sed '/^#/s|y\.tab\.c|$@|' y.tab.c > $@
 	rm -f y.tab.c
 
-.c.@OBJEXT@:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+ext/extinit.@OBJEXT@: ext/extinit.c $(SETUP)
+	$(CC) $(CFLAGS) $(CPPFLAGS) @OUTFLAG@$@ -c ext/extinit.c
+
+acosh.@OBJEXT@: $(srcdir)/missing/acosh.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/acosh.c
+
+alloca.@OBJEXT@: $(srcdir)/missing/alloca.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/alloca.c
+
+crypt.@OBJEXT@: $(srcdir)/missing/crypt.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/crypt.c
+
+dup2.@OBJEXT@: $(srcdir)/missing/dup2.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/dup2.c
+
+fileblocks.@OBJEXT@: $(srcdir)/missing/fileblocks.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/fileblocks.c
+
+finite.@OBJEXT@: $(srcdir)/missing/finite.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/finite.c
+
+flock.@OBJEXT@: $(srcdir)/missing/flock.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/flock.c
+
+isinf.@OBJEXT@: $(srcdir)/missing/isinf.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/isinf.c
+
+isnan.@OBJEXT@: $(srcdir)/missing/isnan.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/isnan.c
+
+fnmatch.@OBJEXT@: $(srcdir)/missing/fnmatch.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/fnmatch.c
+
+memcmp.@OBJEXT@: $(srcdir)/missing/memcmp.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/memcmp.c
+
+memmove.@OBJEXT@: $(srcdir)/missing/memmove.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/memmove.c
 
-.s.@OBJEXT@:
-	$(AS) $(ASFLAGS) -o $@ $<
+mkdir.@OBJEXT@: $(srcdir)/missing/mkdir.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/mkdir.c
 
-clean-local::
-	@$(RM) ext/extinit.c ext/extinit.$(OBJEXT)
+vsnprintf.@OBJEXT@: $(srcdir)/missing/vsnprintf.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/vsnprintf.c
 
-distclean-local::
-	@$(RM) ext/config.cache $(RBCONFIG)
+strcasecmp.@OBJEXT@: $(srcdir)/missing/strcasecmp.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strcasecmp.c
 
-ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -o$@ -c ext/extinit.c
+strncasecmp.@OBJEXT@: $(srcdir)/missing/strncasecmp.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strncasecmp.c
+
+strchr.@OBJEXT@: $(srcdir)/missing/strchr.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strchr.c
+
+strerror.@OBJEXT@: $(srcdir)/missing/strerror.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strerror.c
+
+strftime.@OBJEXT@: $(srcdir)/missing/strftime.c
+	$(CC) -I. $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strftime.c
+
+strstr.@OBJEXT@: $(srcdir)/missing/strstr.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strstr.c
+
+strtol.@OBJEXT@: $(srcdir)/missing/strtol.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strtol.c
+
+strtoul.@OBJEXT@: $(srcdir)/missing/strtoul.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/strtoul.c
+
+x68.@OBJEXT@: $(srcdir)/missing/x68.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/x68.c
+
+os2.@OBJEXT@: $(srcdir)/missing/os2.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/os2.c
+
+dl_os2.@OBJEXT@: $(srcdir)/missing/dl_os2.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $(srcdir)/missing/dl_os2.c
+
+win32.@OBJEXT@: $(srcdir)/win32/win32.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -I$(srcdir)/win32 -c $(srcdir)/win32/win32.c
+
+# Prevent GNU make v3 from overflowing arg limit on SysV.
+.NOEXPORT:
+###
+array.@OBJEXT@: array.c ruby.h config.h defines.h intern.h missing.h \
+  util.h st.h
+bignum.@OBJEXT@: bignum.c ruby.h config.h defines.h intern.h missing.h
+class.@OBJEXT@: class.c ruby.h config.h defines.h intern.h missing.h \
+  rubysig.h node.h st.h
+compar.@OBJEXT@: compar.c ruby.h config.h defines.h intern.h missing.h
+dir.@OBJEXT@: dir.c ruby.h config.h defines.h intern.h missing.h util.h
+dln.@OBJEXT@: dln.c ruby.h config.h defines.h intern.h missing.h dln.h
+dmyext.@OBJEXT@: dmyext.c
+enum.@OBJEXT@: enum.c ruby.h config.h defines.h intern.h missing.h node.h \
+  util.h
+error.@OBJEXT@: error.c ruby.h config.h defines.h intern.h missing.h \
+  env.h st.h
+eval.@OBJEXT@: eval.c ruby.h config.h defines.h intern.h missing.h node.h \
+  env.h util.h rubysig.h st.h dln.h
+file.@OBJEXT@: file.c ruby.h config.h defines.h intern.h missing.h \
+  rubyio.h rubysig.h util.h dln.h
+gc.@OBJEXT@: gc.c ruby.h config.h defines.h intern.h missing.h rubysig.h \
+  st.h node.h env.h re.h regex.h
+hash.@OBJEXT@: hash.c ruby.h config.h defines.h intern.h missing.h st.h \
+  util.h rubysig.h
+inits.@OBJEXT@: inits.c ruby.h config.h defines.h intern.h missing.h
+io.@OBJEXT@: io.c ruby.h config.h defines.h intern.h missing.h rubyio.h \
+  rubysig.h env.h util.h
+main.@OBJEXT@: main.c ruby.h config.h defines.h intern.h missing.h
+marshal.@OBJEXT@: marshal.c ruby.h config.h defines.h intern.h missing.h \
+  rubyio.h st.h util.h
+math.@OBJEXT@: math.c ruby.h config.h defines.h intern.h missing.h
+numeric.@OBJEXT@: numeric.c ruby.h config.h defines.h intern.h missing.h
+object.@OBJEXT@: object.c ruby.h config.h defines.h intern.h missing.h \
+  st.h util.h
+pack.@OBJEXT@: pack.c ruby.h config.h defines.h intern.h missing.h
+parse.@OBJEXT@: parse.c ruby.h config.h defines.h intern.h missing.h \
+  env.h node.h st.h regex.h util.h lex.c
+prec.@OBJEXT@: prec.c ruby.h config.h defines.h intern.h missing.h
+process.@OBJEXT@: process.c ruby.h config.h defines.h intern.h missing.h \
+  rubysig.h st.h
+random.@OBJEXT@: random.c ruby.h config.h defines.h intern.h missing.h
+range.@OBJEXT@: range.c ruby.h config.h defines.h intern.h missing.h
+re.@OBJEXT@: re.c ruby.h config.h defines.h intern.h missing.h re.h \
+  regex.h
+regex.@OBJEXT@: regex.c config.h regex.h
+ruby.@OBJEXT@: ruby.c ruby.h config.h defines.h intern.h missing.h dln.h \
+  node.h util.h
+signal.@OBJEXT@: signal.c ruby.h config.h defines.h intern.h missing.h \
+  rubysig.h
+sprintf.@OBJEXT@: sprintf.c ruby.h config.h defines.h intern.h missing.h
+st.@OBJEXT@: st.c config.h st.h
+string.@OBJEXT@: string.c ruby.h config.h defines.h intern.h missing.h \
+  re.h regex.h
+struct.@OBJEXT@: struct.c ruby.h config.h defines.h intern.h missing.h
+time.@OBJEXT@: time.c ruby.h config.h defines.h intern.h missing.h
+util.@OBJEXT@: util.c ruby.h config.h defines.h intern.h missing.h util.h
+variable.@OBJEXT@: variable.c ruby.h config.h defines.h intern.h \
+  missing.h env.h node.h st.h util.h
+version.@OBJEXT@: version.c ruby.h config.h defines.h intern.h missing.h \
+  version.h
diff --git a/README b/README
index cf836415ad..bde22dff78 100644
--- a/README
+++ b/README
@@ -22,24 +22,16 @@ Perl).  It is simple, straight-forward, and extensible.
 
 * How to get Ruby
 
-The Ruby distribution files can be found in the following FTP site:
+The Ruby distribution can be found on:
 
   ftp://ftp.ruby-lang.org/pub/ruby/
 
-The latest source code of this version series can be checked out
-through SVN with the following command:
+You can get it by anonymous CVS.  How to check out is:
 
-  $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6/
-
-The trunk of the Ruby source tree can be checked out with the
-following command:
-
-  $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
-
-There are some other branches under development.  Try the following
-command and see the list of branches:
-
-  $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
+  $ cvs -d :pserver:anonymous@cvs.ruby-lang.org:/src login
+  (Logging in to anonymous@cvs.ruby-lang.org)
+  CVS password: anonymous
+  $ cvs -z4 -d :pserver:anonymous@cvs.ruby-lang.org:/src checkout ruby
 
 
 * Ruby home-page
@@ -70,7 +62,7 @@ This is what you need to do to compile and install Ruby:
 
   2. Run ./configure, which will generate config.h and Makefile.
 
-  3. Edit defines.h if you need.  Usually this step will not be needed.
+  3. Edit defines.h if you need.  Probably this step will not need.
 
   4. Remove comment mark(#) before the module names from ext/Setup (or
      add module names if not present), if you want to link modules
diff --git a/README.EXT b/README.EXT
index e5d39911ca..d832d1e0af 100644
--- a/README.EXT
+++ b/README.EXT
@@ -295,15 +295,6 @@ To define alias to the method,
 
   void rb_define_alias(VALUE module, const char* new, const char* old);
 
-To define and undefine the `allocate' class method,
-
-  void rb_define_alloc_func(VALUE klass, VALUE (*func)(VALUE klass));
-  void rb_undef_alloc_func(VALUE klass);
-
-func have to take the klass as the argument and return a newly
-allocated instance.  This instance should be empty as possible,
-without any expensive (including external) resources.
-
 2.1.3 Constant definition
 
 We have 2 functions to define constants:
@@ -330,30 +321,17 @@ of the innermost method (which is defined by Ruby) can be accessed.
 
 2.2.2 ID or Symbol
 
-You can invoke methods directly, without parsing the string.  First I need
-to explain about ID.  ID is the integer number to represent Ruby's
-identifiers such as variable names.  The Ruby data type corresponding to ID
-is Symbol.  It can be accessed from Ruby in the form:
+You can invoke methods directly, without parsing the string.  First I
+need to explain about symbols (whose data type is ID).  ID is the
+integer number to represent Ruby's identifiers such as variable names.
+It can be accessed from Ruby in the form:
 
  :Identifier
 
-You can get the ID value from a string within C code by using
+You can get the symbol value from a string within C code by using
 
   rb_intern(const char *name)
 
-You can retrieve ID from Ruby object (Symbol or String) given as an
-argument by using
-
-  rb_to_id(VALUE symbol)
-
-You can convert C ID to Ruby Symbol by using
-
-  VALUE ID2SYM(ID id)
-
-and to convert Ruby Symbol object to ID, use
-
-  ID SYM2ID(VALUE symbol)
-
 2.2.3 Invoke Ruby method from C
 
 To invoke methods directly, you can use the function below
@@ -617,7 +595,8 @@ are not exported to the Ruby world.  You need to protect them by
 (4) prepare extconf.rb
 
 If the file named extconf.rb exists, it will be executed to generate
-Makefile.
+Makefile.  If not, the compilation scheme will try to generate Makefile
+anyway.
 
 extconf.rb is the file for check compilation conditions etc.  You
 need to put
@@ -634,14 +613,8 @@ various conditions.
 
 The value of the variables below will affect the Makefile.
 
-  $CFLAGS: included in CFLAGS make variable (such as -O)
-  $CPPFLAGS: included in CPPFLAGS make variable (such as -I, -D)
+  $CFLAGS: included in CFLAGS make variable (such as -I)
   $LDFLAGS: included in LDFLAGS make variable (such as -L)
-  $objs: list of object file names
-
-In normal, object files list is automatically generated by searching
-source files, but you need directs them explicitly if any sources will
-be generated while building.
 
 If a compilation condition is not fulfilled, you should not call
 ``create_makefile''.  The Makefile will not generated, compilation will
@@ -799,9 +772,7 @@ NUM2INT(value)
 INT2NUM(i)
 NUM2DBL(value)
 rb_float_new(f)
-StringValue(value)
-StringValuePtr(value)
-StringValueCStr(value)
+STR2CSTR(value)
 rb_str_new2(s)
 
 ** defining class/module
@@ -1035,11 +1006,6 @@ Appendix C. Functions Available in extconf.rb
 
 These functions are available in extconf.rb:
 
- have_macro(macro, headers)
-
-Checks whether macro is defined with header.  Returns true if the macro
-is defined.
-
  have_library(lib, func)
 
 Checks whether the library exists, containing the specified function.
@@ -1056,61 +1022,20 @@ Checks whether func exists with header.  Returns true if the function
 exists.  To check functions in an additional library, you need to
 check that library first using have_library().
 
- have_var(var, header)
-
-Checks whether var exists with header.  Returns true if the variable
-exists.  To check variables in an additional library, you need to
-check that library first using have_library().
-
  have_header(header)
 
 Checks whether header exists.  Returns true if the header file exists.
 
- find_header(header, path...)
-
-Checks whether header exists in path.  Returns true if the header file
-exists.
-
- have_struct_member(type, member, header)
-
-Checks whether type has member with header.  Returns true if the type
-is defined and has the member.
-
- have_type(type, header, opt)
-
-Checks whether type is defined with header.  Returns true if the type
-is defined.
-
- check_sizeof(type, header)
-
-Checks the size of type in char with header.  Returns the size if the
-type is defined, otherwise nil.
-
  create_makefile(target)
 
 Generates the Makefile for the extension library.  If you don't invoke
 this method, the compilation will not be done.
 
- find_executable(bin, path)
-
-Finds command in path, which is File::PATH_SEPARATOR-separated list of
-directories.  If path is nil or omitted, environment varialbe PATH
-will be used.  Returns the path name of the command if it is found,
-otherwise nil.
-
  with_config(withval[, default=nil])
 
 Parses the command line options and returns the value specified by
 --with-<withval>.
 
- enable_config(config, *defaults)
- disable_config(config, *defaults)
-
-Parses the command line options for boolean.  Returns true if
---enable-<config> is given, or false if --disable-<config> is given.
-Otherwise, yields defaults to the given block and returns the result
-if it is called with a block, or returns defaults.
-
  dir_config(target[, default_dir])
  dir_config(target[, default_include, default_lib])
 
@@ -1120,12 +1045,6 @@ to $CFLAGS and/or $LDFLAGS.  --with-<target>-dir=/path is equivalent to
 --with-<target>-include=/path/include --with-<target>-lib=/path/lib.
 Returns an array of the added directories ([include_dir, lib_dir]).
 
- pkg_config(pkg)
-
-Obtains the information of pkg by pkg-config command.  The actual
-command name can be overriden by --with-pkg-config command line
-option.
-
 /*
  * Local variables:
  * fill-column: 70
diff --git a/README.EXT.ja b/README.EXT.ja
index 30c4d520ba..7a4cb5df2a 100644
--- a/README.EXT.ja
+++ b/README.EXT.ja
@@ -331,17 +331,6 @@ private�᥽�åɤȤϴؿ������Ǥ����ƤӽФ����Ȥν���ʤ��᥽��
 
   void rb_define_alias(VALUE module, const char* new, const char* old);
 
-���饹�᥽�å�allocate������������������ꤹ�뤿��δؿ���
-�ʲ����̤�Ǥ���
-
-  void rb_define_alloc_func(VALUE klass, VALUE (*func)(VALUE klass));
-  void rb_undef_alloc_func(VALUE klass);
-
-func�ϥ��饹������Ȥ��Ƽ�����äơ�������������Ƥ�줿����
-�����󥹤��֤��ʤ��ƤϤʤ�ޤ��󡣤��Υ��󥹥��󥹤ϡ�������
-�������ʤɤ�ޤޤʤ����Ǥ�������ֶ��פΤޤޤˤ��Ƥ������ۤ�
-���褤�Ǥ��礦��
-
 2.1.3 ������
 
 ��ĥ�饤�֥�꤬ɬ�פ�����Ϥ��餫����������Ƥ����������ɤ�
@@ -380,8 +369,7 @@ C����ʸ������ͳ������Ruby�Υ᥽�åɤ�ƤӽФ����Ȥ�Ǥ���
 �����������ˡ�Ruby���󥿥ץ꥿��ǥ᥽�åɤ��ѿ�̾����ꤹ��
 ���˻Ȥ��Ƥ���ID�ˤĤ����������Ƥ����ޤ��礦��
 
-ID�Ȥ��ѿ�̾���᥽�å�̾��ɽ�������Ǥ���Ruby�Ǥ�ID���б�����
-���֥������ȤȤ��ƥ���ܥ�(Symbol)�����ꡤ
+ID�Ȥ��ѿ�̾���᥽�å�̾��ɽ�������Ǥ���Ruby����Ǥ�
 
  :���̻�
 
@@ -394,14 +382,6 @@ ID�Ȥ��ѿ�̾���᥽�å�̾��ɽ�������Ǥ���Ruby�Ǥ�ID���б�����
 
   rb_to_id(VALUE symbol)
 
-ID���饷��ܥ�����뤿��ˤϰʲ��Υޥ�����Ȥ��ޤ���
-
-  VALUE ID2SYM(ID id)
-
-����ܥ뤫��ID�����뤿��ˤϰʲ��Υޥ�����Ȥ��ޤ���
-
-  ID SYM2ID(VALUE symbol)
-
 2.2.3 C����Ruby�Υ᥽�åɤ�ƤӽФ�
 
 C����ʸ������ͳ������Ruby�Υ᥽�åɤ�ƤӽФ�����ˤϰʲ�
@@ -730,14 +710,8 @@ Makefile������ο����ˤʤ�extconf.rb�Ȥ����ե��������
 
 �ʲ����ѿ���Ȥ����Ȥ��Ǥ��ޤ���
 
-  $CFLAGS: ����ѥ�������ɲ�Ū�˻��ꤹ��ե饰(-O�ʤ�)
-  $CPPFLAGS: �ץ�ץ����å����ɲ�Ū�˻��ꤹ��ե饰(-I��-D�ʤ�)
+  $CFLAGS: ����ѥ�������ɲ�Ū�˻��ꤹ��ե饰(-I�ʤ�)
   $LDFLAGS: ��󥯻����ɲ�Ū�˻��ꤹ��ե饰(-L�ʤ�)
-  $objs: ��󥯤���륪�֥������ȥե�����̾�Υꥹ��
-
-���֥������ȥե�����Υꥹ�Ȥϡ��̾�ϥ������ե�����򸡺���
-�Ƽ�ưŪ����������ޤ�����make������ǥ���������������褦��
-��������Ū�˻��ꤹ��ɬ�פ�����ޤ���
 
 �饤�֥��򥳥�ѥ��뤹���郎·�鷺�����Υ饤�֥��򥳥�
 �ѥ��뤷�ʤ����ˤ�create_makefile��ƤФʤ����Makefile����
@@ -917,9 +891,7 @@ NUM2INT(value)
 INT2NUM(i)
 NUM2DBL(value)
 rb_float_new(f)
-StringValue(value)
-StringValuePtr(value)
-StringValueCStr(value)
+STR2CSTR(value)
 rb_str_new2(s)
 
 ** ���饹/�⥸�塼�����
@@ -1151,12 +1123,6 @@ Appendix C. extconf.rb�ǻȤ���ؿ�����
 extconf.rb����Ǥ����Ѳ�ǽ�ʥ���ѥ���������å��δؿ��ϰ�
 �����̤�Ǥ��롥
 
-have_macro(macro, headers)
-
-  �إå��ե�����header�򥤥󥯥롼�ɤ��ƥޥ���macro�������
-  ��Ƥ��뤫�ɤ��������å����롥�ޥ������������Ƥ����true
-  ���֤���
-
 have_library(lib, func)
 
   �ؿ�func��������Ƥ���饤�֥��lib��¸�ߤ�����å����롥
@@ -1174,67 +1140,21 @@ have_func(func, header)
   ����ˤ����have_library�Ǥ��Υ饤�֥�������å����Ƥ���
   �����ؿ���¸�ߤ����true���֤���
 
-have_var(var, header)
-
-  �إå��ե�����header�򥤥󥯥롼�ɤ����ѿ�var��¸�ߤ������
-  �����롥var��ɸ��Ǥϥ�󥯤���ʤ��饤�֥����Τ�ΤǤ�
-  ����ˤ����have_library�Ǥ��Υ饤�֥�������å����Ƥ���
-  �����ѿ���¸�ߤ����true���֤���
-
 have_header(header)
 
   �إå��ե������¸�ߤ�����å����롥�إå��ե����뤬¸�ߤ�
   ���true���֤���
 
-find_header(header, path...)
-
-  �إå��ե�����header��¸�ߤ� -Ipath ���ɲä��ʤ�������å�
-  ���롥�إå��ե����뤬���դ��ä�����true���֤���
-
-have_struct_member(type, member, header)
-
-  �إå��ե�����header�򥤥󥯥롼�ɤ��Ʒ�type�˥���member
-  ��¸�ߤ��뤫������å����롥type���������Ƥ��ơ�member��
-  ���Ĥ����true���֤���
-
-have_type(type, header, opt)
-
-  �إå��ե�����header�򥤥󥯥롼�ɤ��Ʒ�type��¸�ߤ��뤫��
-  �����å����롥type���������Ƥ����true���֤���
-
-check_sizeof(type, header)
-
-  �إå��ե�����header�򥤥󥯥롼�ɤ��Ʒ�type��charñ�̥���
-  ����Ĵ�٤롥type���������Ƥ�������Υ��������֤��������
-  ��Ƥ��ʤ��Ȥ���nil���֤���
-
 create_makefile(target)
 
   ��ĥ�饤�֥���Ѥ�Makefile���������롥���δؿ���ƤФʤ���
   �Ф��Υ饤�֥��ϥ���ѥ��뤵��ʤ���target�ϥ⥸�塼��̾
   ��ɽ����
 
-find_executable(command, path)
-
-  ���ޥ��command��File::PATH_SEPARATOR�Ƕ��ڤ�줿�ѥ�̾��
-  �ꥹ��path����õ����path��nil�ޤ��Ͼ�ά���줿���ϡ��Ķ�
-  �ѿ�PATH���ͤ���Ѥ��롥�¹Բ�ǽ�ʥ��ޥ�ɤ����Ĥ��ä����
-  �ϥѥ���ޤ�ե�����̾�����Ĥ���ʤ��ä�����nil���֤���
-
 with_config(withval[, default=nil])
 
   ���ޥ�ɥ饤����--with-<withval>�ǻ��ꤵ�줿���ץ�����ͤ����롥
 
-enable_config(config, *defaults)
-disable_config(config, *defaults)
-
-  ���ޥ�ɥ饤����--enable-<config>�ޤ���
-  --disable-<config>�ǻ��ꤵ�줿�����ͤ����롥
-  --enable-<config>�����ꤵ��Ƥ�������true��
-  --disable-<config>�����ꤵ��Ƥ�������false���֤���
-  �ɤ������ꤵ��Ƥ��ʤ����ϡ��֥��å��Ĥ��ǸƤӽФ���Ƥ������
-  *defaults��yield������̡��֥��å��ʤ��ʤ�*defaults���֤���
-
 dir_config(target[, default_dir])
 dir_config(target[, default_include, default_lib])
 
@@ -1245,12 +1165,6 @@ dir_config(target[, default_include, default_lib])
   �������Ǥ��롥�ɲä��줿 include �ǥ��쥯�ȥ�� lib �ǥ��쥯�ȥ��
   ������֤��� ([include_dir, lib_dir])
 
-pkg_config(pkg)
-
-  pkg-config���ޥ�ɤ���ѥå�����pkg�ξ�������롥 
-  pkg-config�μºݤΥ��ޥ��̾�ϡ�--with-pkg-config���ޥ��
-  �饤�󥪥ץ����ǻ����ǽ��
-
 /*
  * Local variables:
  * fill-column: 60
diff --git a/README.ja b/README.ja
index df8cfc03f4..fc502dd440 100644
--- a/README.ja
+++ b/README.ja
@@ -26,25 +26,18 @@ Ruby�ϥƥ����Ƚ����ط���ǽ�Ϥʤɤ�ͥ�졤Perl��Ʊ�����餤����
 
 * ����ˡ
 
-** FTP��
+** ftp��
 
 �ʲ��ξ��ˤ����Ƥ���ޤ���
 
   ftp://ftp.ruby-lang.org/pub/ruby/
 
-** Subversion��
+** CVS��
 
-�ܥ֥�����Ruby�κǿ��Υ����������ɤϼ��Υ��ޥ�ɤǼ����Ǥ��ޤ���
-
-  $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6/
-
-��ȯ��ü�Υ����������ɤϼ��Υ��ޥ�ɤǼ����Ǥ��ޤ���
-
-  $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
-
-¾�˳�ȯ��Υ֥����ΰ����ϼ��Υ��ޥ�ɤǸ����ޤ���
-
-  $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
+  $ cvs -d :pserver:anonymous@cvs.ruby-lang.org:/src login
+  (Logging in to anonymous@cvs.ruby-lang.org)
+  CVS password: anonymous
+  $ cvs -z4 -d :pserver:anonymous@cvs.ruby-lang.org:src checkout ruby
 
 
 * �ۡ���ڡ���
diff --git a/array.c b/array.c
index a67e9233d1..03647f81fd 100644
--- a/array.c
+++ b/array.c
@@ -2,8 +2,8 @@
 
   array.c -
 
-  $Author: akr $
-  $Date: 2006/06/24 14:53:36 $
+  $Author$
+  $Date$
   created at: Fri Aug  6 09:46:12 JST 1993
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -188,8 +188,6 @@ rb_ary_new4(n, elts)
     if (n > 0 && elts) {
 	MEMCPY(RARRAY(ary)->ptr, elts, VALUE, n);
     }
-
-    /* This assignment to len will be moved to the above "if" block in Ruby 1.9 */
     RARRAY(ary)->len = n;
 
     return ary;
@@ -336,6 +334,9 @@ rb_ary_s_create(argc, argv, klass)
 {
     VALUE ary = ary_alloc(klass);
 
+    if (argc < 0) {
+	rb_raise(rb_eArgError, "negative number of arguments");
+    }
     if (argc > 0) {
 	RARRAY(ary)->ptr = ALLOC_N(VALUE, argc);
 	MEMCPY(RARRAY(ary)->ptr, argv, VALUE, argc);
@@ -351,6 +352,7 @@ rb_ary_store(ary, idx, val)
     long idx;
     VALUE val;
 {
+    rb_ary_modify(ary);
     if (idx < 0) {
 	idx += RARRAY(ary)->len;
 	if (idx < 0) {
@@ -359,7 +361,6 @@ rb_ary_store(ary, idx, val)
 	}
     }
 
-    rb_ary_modify(ary);
     if (idx >= RARRAY(ary)->aux.capa) {
 	long new_capa = RARRAY(ary)->aux.capa / 2;
 
@@ -551,6 +552,9 @@ rb_ary_unshift_m(argc, argv, ary)
 {
     long len = RARRAY(ary)->len;
 
+    if (argc < 0) {
+	rb_raise(rb_eArgError, "negative number of arguments");
+    }
     if (argc == 0) return ary;
 
     /* make rooms by setting the last item */
@@ -717,16 +721,12 @@ rb_ary_at(ary, pos)
 /*
  *  call-seq:
  *     array.first   ->   obj or nil
- *     array.first(n) -> an_array
- *
- *  Returns the first element, or the first +n+ elements, of the array.
- *  If the array is empty, the first form returns <code>nil</code>, and the
- *  second form returns an empty array.
- *
+ *  
+ *  Returns the first element of the array. If the array is empty,
+ *  returns <code>nil</code>.
+ *     
  *     a = [ "q", "r", "s", "t" ]
- *     a.first    #=> "q"
- *     a.first(1) #=> ["q"]
- *     a.first(3) #=> ["q", "r", "s"]
+ *     a.first   #=> "q"
  */
 
 static VALUE
@@ -903,7 +903,7 @@ rb_ary_rindex(ary, val)
  *     array.indexes( i1, i2, ... iN )   -> an_array
  *     array.indices( i1, i2, ... iN )   -> an_array
  *  
- *  Deprecated; use <code>Array#values_at</code>.
+ *  Deprecated; use <code>Array#select</code>.
  */
 
 static VALUE
@@ -938,7 +938,7 @@ rb_ary_to_ary(obj)
 }
 
 static void
-rb_ary_splice(ary, beg, len, rpl)
+rb_ary_update(ary, beg, len, rpl)
     VALUE ary;
     long beg, len;
     VALUE rpl;
@@ -957,6 +957,7 @@ rb_ary_splice(ary, beg, len, rpl)
 	len = RARRAY(ary)->len - beg;
     }
 
+    rb_ary_modify(ary);
     if (NIL_P(rpl)) {
 	rlen = 0;
     }
@@ -964,7 +965,6 @@ rb_ary_splice(ary, beg, len, rpl)
 	rpl = rb_ary_to_ary(rpl);
 	rlen = RARRAY(rpl)->len;
     }
-    rb_ary_modify(ary);
 
     if (beg >= RARRAY(ary)->len) {
 	len = beg + rlen;
@@ -1045,7 +1045,7 @@ rb_ary_aset(argc, argv, ary)
 	if (SYMBOL_P(argv[1])) {
 	    rb_raise(rb_eTypeError, "Symbol as subarray length");
 	}
-	rb_ary_splice(ary, NUM2LONG(argv[0]), NUM2LONG(argv[1]), argv[2]);
+	rb_ary_update(ary, NUM2LONG(argv[0]), NUM2LONG(argv[1]), argv[2]);
 	return argv[2];
     }
     if (argc != 2) {
@@ -1060,7 +1060,7 @@ rb_ary_aset(argc, argv, ary)
     }
     if (rb_range_beg_len(argv[0], &beg, &len, RARRAY(ary)->len, 1)) {
 	/* check if idx is Range */
-	rb_ary_splice(ary, beg, len, argv[1]);
+	rb_ary_update(ary, beg, len, argv[1]);
 	return argv[1];
     }
 
@@ -1090,7 +1090,6 @@ rb_ary_insert(argc, argv, ary)
 {
     long pos;
 
-    if (argc == 1) return ary;
     if (argc < 1) {
 	rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
     }
@@ -1098,10 +1097,12 @@ rb_ary_insert(argc, argv, ary)
     if (pos == -1) {
 	pos = RARRAY(ary)->len;
     }
-    if (pos < 0) {
+    else if (pos < 0) {
 	pos++;
     }
-    rb_ary_splice(ary, pos, 0, rb_ary_new4(argc - 1, argv + 1));
+
+    if (argc == 1) return ary;
+    rb_ary_update(ary, pos, 0, rb_ary_new4(argc - 1, argv + 1));
     return ary;
 }
 
@@ -1589,8 +1590,8 @@ sort_2(ap, bp, data)
 	if ((long)a < (long)b) return -1;
 	return 0;
     }
-    if (TYPE(a) == T_STRING) {
-	if (TYPE(b) == T_STRING) return rb_str_cmp(a, b);
+    if (TYPE(a) == T_STRING && TYPE(b) == T_STRING) {
+	return rb_str_cmp(a, b);
     }
 
     retval = rb_funcall(a, id_cmp, 1, b);
@@ -1804,12 +1805,17 @@ rb_ary_values_at(argc, argv, ary)
  */
 
 static VALUE
-rb_ary_select(ary)
+rb_ary_select(argc, argv, ary)
+    int argc;
+    VALUE *argv;
     VALUE ary;
 {
     VALUE result;
     long i;
 
+    if (argc > 0) {
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+    }
     result = rb_ary_new2(RARRAY(ary)->len);
     for (i = 0; i < RARRAY(ary)->len; i++) {
 	if (RTEST(rb_yield(RARRAY(ary)->ptr[i]))) {
@@ -1843,6 +1849,7 @@ rb_ary_delete(ary, item)
 {
     long i1, i2;
 
+    rb_ary_modify(ary);
     for (i1 = i2 = 0; i1 < RARRAY(ary)->len; i1++) {
 	VALUE e = RARRAY(ary)->ptr[i1];
 
@@ -1859,7 +1866,6 @@ rb_ary_delete(ary, item)
 	return Qnil;
     }
 
-    rb_ary_modify(ary);
     if (RARRAY(ary)->len > i2) {
 	RARRAY(ary)->len = i2;
 	if (i2 * 2 < RARRAY(ary)->aux.capa &&
@@ -1880,13 +1886,13 @@ rb_ary_delete_at(ary, pos)
     long i, len = RARRAY(ary)->len;
     VALUE del;
 
+    rb_ary_modify(ary);
     if (pos >= len) return Qnil;
     if (pos < 0) {
 	pos += len;
 	if (pos < 0) return Qnil;
     }
 
-    rb_ary_modify(ary);
     del = RARRAY(ary)->ptr[pos];
     for (i = pos + 1; i < len; i++, pos++) {
 	RARRAY(ary)->ptr[pos] = RARRAY(ary)->ptr[i];
@@ -1951,6 +1957,7 @@ rb_ary_slice_bang(argc, argv, ary)
     VALUE arg1, arg2;
     long pos, len;
 
+    rb_ary_modify(ary);
     if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2) {
 	pos = NUM2LONG(arg1);
 	len = NUM2LONG(arg2);
@@ -1959,7 +1966,7 @@ rb_ary_slice_bang(argc, argv, ary)
 	    pos = RARRAY(ary)->len + pos;
 	}
 	arg2 = rb_ary_subseq(ary, pos, len);
-	rb_ary_splice(ary, pos, len, Qnil);	/* Qnil/rb_ary_new2(0) */
+	rb_ary_update(ary, pos, len, Qnil);	/* Qnil/rb_ary_new2(0) */
 	return arg2;
     }
 
@@ -2129,7 +2136,7 @@ rb_ary_transpose(ary)
 	    }
 	}
 	else if (elen != RARRAY(tmp)->len) {
-	    rb_raise(rb_eIndexError, "element size differs (%d should be %d)",
+	    rb_raise(rb_eIndexError, "element size differ (%d should be %d)",
 		     RARRAY(tmp)->len, elen);
 	}
 	for (j=0; j<elen; j++) {
@@ -2225,7 +2232,7 @@ rb_ary_fill(argc, argv, ary)
     VALUE ary;
 {
     VALUE item, arg1, arg2;
-    long beg = 0, end = 0, len = 0;
+    long beg, end, len;
     VALUE *p, *pend;
     int block_p = Qfalse;
 
@@ -2263,7 +2270,9 @@ rb_ary_fill(argc, argv, ary)
 	    REALLOC_N(RARRAY(ary)->ptr, VALUE, end);
 	    RARRAY(ary)->aux.capa = end;
 	}
-	rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, end - RARRAY(ary)->len);
+	if (beg > RARRAY(ary)->len) {
+	    rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, end - RARRAY(ary)->len);
+	}
 	RARRAY(ary)->len = end;
     }
 
@@ -2329,7 +2338,7 @@ rb_ary_concat(x, y)
 {
     y = to_ary(y);
     if (RARRAY(y)->len > 0) {
-	rb_ary_splice(x, RARRAY(x)->len, 0, y);
+	rb_ary_update(x, RARRAY(x)->len, 0, y);
     }
     return x;
 }
@@ -2640,8 +2649,7 @@ static VALUE
 rb_ary_diff(ary1, ary2)
     VALUE ary1, ary2;
 {
-    VALUE ary3;
-    volatile VALUE hash;
+    VALUE ary3, hash;
     long i;
 
     hash = ary_make_hash(to_ary(ary2), 0);
@@ -2746,6 +2754,8 @@ rb_ary_uniq_bang(ary)
     VALUE hash, v, vv;
     long i, j;
 
+    rb_ary_modify(ary); 
+
     hash = ary_make_hash(ary, 0);
 
     if (RARRAY(ary)->len == RHASH(hash)->tbl->num_entries) {
@@ -2876,7 +2886,7 @@ flatten(ary, idx, ary2, memo)
 	rb_raise(rb_eArgError, "tried to flatten recursive array");
     }
     rb_ary_push(memo, id);
-    rb_ary_splice(ary, idx, 1, ary2);
+    rb_ary_update(ary, idx, 1, ary2);
     while (i < lim) {
 	VALUE tmp;
 
@@ -2914,6 +2924,7 @@ rb_ary_flatten_bang(ary)
     int mod = 0;
     VALUE memo = Qnil;
 
+    rb_ary_modify(ary);
     while (i<RARRAY(ary)->len) {
 	VALUE ary2 = RARRAY(ary)->ptr[i];
 	VALUE tmp;
@@ -3016,7 +3027,7 @@ Init_Array()
     rb_define_method(rb_cArray, "collect!", rb_ary_collect_bang, 0);
     rb_define_method(rb_cArray, "map", rb_ary_collect, 0);
     rb_define_method(rb_cArray, "map!", rb_ary_collect_bang, 0);
-    rb_define_method(rb_cArray, "select", rb_ary_select, 0);
+    rb_define_method(rb_cArray, "select", rb_ary_select, -1);
     rb_define_method(rb_cArray, "values_at", rb_ary_values_at, -1);
     rb_define_method(rb_cArray, "delete", rb_ary_delete, 1);
     rb_define_method(rb_cArray, "delete_at", rb_ary_delete_at_m, 1);
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index 030a799e99..0c4c6bb126 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -1,7 +1,6 @@
 # -*- makefile -*-
 
 SHELL = $(COMSPEC)
-MKFILES = Makefile
 
 #### Start of system configuration section. ####
 OS = bccwin32
@@ -57,7 +56,6 @@ AR = tlib
 
 PURIFY =
 AUTOCONF = autoconf
-RM = $(srcdir:/=\)\win32\rm.bat
 
 !if !defined(PROCESSOR_ARCHITECTURE)
 PROCESSOR_ARCHITECTURE = x86
@@ -93,28 +91,14 @@ exec_prefix = $(prefix)
 !ifndef libdir
 libdir = $(exec_prefix)/lib
 !endif
-!if !defined(datadir)
-datadir = /share
+!ifndef DESTDIR
+DESTDIR = $(prefix)
 !endif
-!ifndef EXTOUT
-EXTOUT = .ext
-!endif
-!ifndef RIDATADIR
-RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
-!endif
-!ifndef TESTUI
-TESTUI = console
-!endif
-!ifndef TESTS
-TESTS =
-!endif
-!ifndef RDOCTARGET
-RDOCTARGET = install-nodoc
-!endif
-
-OUTFLAG       = -o
 !ifndef CFLAGS
-CFLAGS = -q -tWR -tWC $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
+CFLAGS = -q $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
+!endif
+!ifndef CPPFLAGS
+CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)missing
 !endif
 !ifndef LDFLAGS
 LDFLAGS = -S:$(STACK)
@@ -125,17 +109,14 @@ RFLAGS = $(iconinc)
 !ifndef EXTLIBS
 EXTLIBS =
 !endif
-!ifndef MEMLIB
-MEMLIB =
-!endif
-LIBS = $(MEMLIB) cw32i.lib import32.lib ws2_32.lib $(EXTLIBS)
+LIBS = cw32.lib import32.lib ws2_32.lib $(EXTLIBS)
 MISSING = acosh.obj crypt.obj erf.obj win32.obj
 
 !ifndef STACK
 STACK = 0x2000000
 !endif
 
-XCFLAGS = -DRUBY_EXPORT -I. -I$(srcdir) -I$(srcdir)missing
+XCFLAGS = -DRUBY_EXPORT
 
 ARFLAGS = /a
 LD = ilink32 -q -Gn
@@ -154,7 +135,6 @@ PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
 WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
 RUBYDEF = $(RUBY_SO_NAME).def
 MINIRUBY = .\miniruby$(EXEEXT)
-RUNRUBY = .\ruby$(EXEEXT) "$(srcdir)runruby.rb" --extout="$(EXTOUT)" --
 
 ORGLIBPATH = $(LIB)
 
@@ -165,46 +145,70 @@ LIBRUBY_SO    = $(RUBY_SO_NAME).dll
 LIBRUBY       = $(RUBY_SO_NAME).lib
 LIBRUBYARG    = $(LIBRUBY)
 
-PREP          = miniruby$(EXEEXT)
-
-OBJEXT        = obj
-
-WINMAINOBJ    = winmain.$(OBJEXT)
-MINIOBJS      = dmydln.$(OBJEXT)
-
-.path.c = .;$(srcdir);$(srcdir)win32;$(srcdir)missing
-.path.h = .;$(srcdir);$(srcdir)win32;$(srcdir)missing
-.path.y = $(srcdir)
-.path. = $(srcdir)
-
-.c.obj:
-	$(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) -c $(<:/=\)
-
-.rc.res:
-	$(RC) $(RFLAGS) -I. -I$(<D). $(iconinc) -I$(srcdir)win32 $(RFLAGS) -fo$@ $(<:/=\)
-
-.y.c:
-	$(YACC) $(YFLAGS) $(<:\=/)
-	sed -e "s!^ *extern char \*getenv();!/* & */!;s/^\(#.*\)y\.tab/\1parse/" y.tab.c > $(@F)
-	@del y.tab.c
-
-all: $(srcdir)bcc32/Makefile.sub $(srcdir)common.mk
+!ifndef EXTOBJS
+EXTOBJS       = dmyext.obj
+!endif
+
+MAINOBJ       = main.obj
+WINMAINOBJ    = winmain.obj
+
+OBJS          = array.obj \
+		bignum.obj \
+		class.obj \
+		compar.obj \
+		dir.obj \
+		dln.obj \
+		enum.obj \
+		error.obj \
+		eval.obj \
+		file.obj \
+		gc.obj \
+		hash.obj \
+		inits.obj \
+		io.obj \
+		marshal.obj \
+		math.obj \
+		numeric.obj \
+		object.obj \
+		pack.obj \
+		parse.obj \
+		prec.obj \
+		process.obj \
+		random.obj \
+		range.obj \
+		re.obj \
+		regex.obj \
+		ruby.obj \
+		signal.obj \
+		sprintf.obj \
+		st.obj \
+		string.obj \
+		struct.obj \
+		time.obj \
+		util.obj \
+		variable.obj \
+		version.obj \
+		$(MISSING)
+
+SCRIPT_ARGS   =	"--dest-dir=$(DESTDIR)" \
+		"--make=$(MAKE)" \
+		"--mflags=$(MFLAGS)" \
+		"--make-flags=$(MAKEFLAGS)"
+
+all:		miniruby$(EXEEXT) rbconfig.rb \
+		$(LIBRUBY) $(MISCLIBS)
+		.\miniruby$(EXEEXT) $(srcdir)ext/extmk.rb --extstatic=$(EXTSTATIC) $(SCRIPT_ARGS)
 
 ruby: $(PROGRAM)
 rubyw: $(WPROGRAM)
+lib: $(LIBRUBY)
+dll: $(LIBRUBY_SO)
 
-!include $(srcdir)/common.mk
-
-PHONY: Makefile
-
-CONFIG_H = ./.config.h.time
-
-config: config.status
-
-config.status: $(CONFIG_H)
+config: config.h config.status
 
-$(CONFIG_H): $(MKFILES) $(srcdir)bcc32/Makefile.sub
-	@$(srcdir:/=\)win32\ifchange.bat config.h &&|
+config.h:
+	@echo Creating $(@:.\=)
+	@type > $@ &&|
 \#define HAVE_SYS_TYPES_H 1
 \#define HAVE_SYS_STAT_H 1
 \#define HAVE_STDLIB_H 1
@@ -225,15 +229,11 @@ $(CONFIG_H): $(MKFILES) $(srcdir)bcc32/Makefile.sub
 \#define TOKEN_PASTE(x,y) x\#\#y
 \#define HAVE_STDARG_PROTOTYPES 1
 \#define NORETURN(x) x
-\#define RUBY_EXTERN extern __declspec(dllimport)
 \#define HAVE_DECL_SYS_NERR 1
 \#define HAVE_LIMITS_H 1
 \#define HAVE_FCNTL_H 1
 \#define HAVE_UTIME_H 1
 \#define HAVE_FLOAT_H 1
-\#define rb_uid_t uid_t
-\#define rb_gid_t gid_t
-\#define rb_pid_t int
 \#define HAVE_STRUCT_STAT_ST_RDEV 1
 \#define HAVE_ST_RDEV 1
 \#define GETGROUPS_T int
@@ -253,14 +253,12 @@ $(CONFIG_H): $(MKFILES) $(srcdir)bcc32/Makefile.sub
 \#define HAVE_STRTOUL 1
 \#define HAVE_ISNAN 1
 \#define HAVE_FINITE 1
-\#define HAVE_HYPOT 1
 \#define HAVE_FMOD 1
 \#define HAVE_WAITPID 1
 \#define HAVE_FSYNC 1
 \#define HAVE_GETCWD 1
 \#define HAVE_CHSIZE 1
 \#define HAVE_TIMES 1
-\#define HAVE_FCNTL 1
 \#define HAVE_LINK 1
 \#define HAVE_TELLDIR 1
 \#define HAVE_SEEKDIR 1
@@ -275,6 +273,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)bcc32/Makefile.sub
 \#define STACK_GROW_DIRECTION -1
 \#define DEFAULT_KCODE KCODE_NONE
 \#define DLEXT ".so"
+\#define DLEXT2 ".dll"
 \#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)"
 \#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
 \#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)"
@@ -282,15 +281,12 @@ $(CONFIG_H): $(MKFILES) $(srcdir)bcc32/Makefile.sub
 \#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
 \#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
 |
-	@exit > $@
 
-config.status: $(MKFILES) $(srcdir)bcc32/Makefile.sub $(srcdir)common.mk
+config.status: Makefile $(srcdir)bcc32/Makefile.sub
 	@echo Creating $@
 	@type > $@ &&|
 # Generated automatically by Makefile.sub.
 s,@SHELL@,$$(COMSPEC),;t t
-s,@BUILD_FILE_SEPARATOR@,\,;t t
-s,@PATH_SEPARATOR@,;,;t t
 s,@CFLAGS@,$(CFLAGS),;t t
 s,@CPPFLAGS@,$(CPPFLAGS),;t t
 s,@CXXFLAGS@,$(CXXFLAGS),;t t
@@ -335,10 +331,6 @@ s,@AR@,$(AR),;t t
 s,@ARFLAGS@,$(ARFLAGS) ,;t t
 s,@LN_S@,$(LN_S),;t t
 s,@SET_MAKE@,$(SET_MAKE),;t t
-s,@CP@,copy > nul,;t t
-s,@INSTALL@,copy > nul,;t t
-s,@INSTALL_PROG@,$$(INSTALL),;t t
-s,@INSTALL_DATA@,$$(INSTALL),;t t
 s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
 s,@ALLOCA@,$(ALLOCA),;t t
 s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t
@@ -352,16 +344,12 @@ s,@STATIC@,$(STATIC),;t t
 s,@CCDLFLAGS@,,;t t
 s,@LDSHARED@,$(LDSHARED),;t t
 s,@DLEXT@,so,;t t
+s,@DLEXT2@,dll,;t t
 s,@LIBEXT@,lib,;t t
 s,@STRIP@,$(STRIP),;t t
 s,@EXTSTATIC@,$(EXTSTATIC),;t t
 s,@setup@,Setup,;t t
 s,@MINIRUBY@,$(MINIRUBY),;t t
-s,@PREP@,miniruby$(EXEEXT),;t t
-s,@RUNRUBY@,$(RUNRUBY),;t t
-s,@EXTOUT@,$(EXTOUT),;t t
-s,@ARCHFILE@,,;t t
-s,@RDOCTARGET@,,;t t
 s,@LIBRUBY_LDSHARED@,$$(LDSHARED),;t t
 s,@LIBRUBY_DLDFLAGS@,-Gi $$(DLDFLAGS),;t t
 s,@RUBY_INSTALL_NAME@,$(RUBY_INSTALL_NAME),;t t
@@ -378,17 +366,16 @@ s,@LIBRUBYARG_SHARED@,$$(LIBRUBY),;t t
 s,@SOLIBS@,$(SOLIBS),;t t
 s,@DLDLIBS@,$(DLDLIBS),;t t
 s,@ENABLE_SHARED@,yes,;t t
-s,@OUTFLAG@,$(OUTFLAG),;t t
+s,@OUTFLAG@,-o,;t t
 s,@CPPOUTFILE@,,;t t
 s,@LIBPATHFLAG@, -L"%s",;t t
 s,@RPATHFLAG@,,;t t
 s,@LIBARG@,%s.lib,;t t
 s,@LINK_SO@,$$(LDSHARED) $$(DLDFLAGS) $$(LIBPATH) $$(OBJS), $$(@:/=\), nul, $$(LIBS) $$(LOCAL_LIBS), $$(DEFFILE), $$(RESFILE),;t t
-s,@COMPILE_C@,$$(CC) $$(INCFLAGS) $$(CFLAGS) $$(CPPFLAGS) -c $$(<:/=\),;t t
-s,@COMPILE_CXX@,$$(CXX) $$(INCFLAGS) $$(CXXFLAGS) $$(CPPFLAGS) -P -c $$(<:/=\),;t t
-s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}.%s: .%s.%s:,;t t
-s,@RULE_SUBST@,{.;$$(VPATH)}%s,;t t
-s,@COMMON_LIBS@,m advapi32 avicap32 avifil32 cap comctl32 comdlg32 dlcapi gdi32 glu32 imagehlp imm32 inetmib1 kernel32 loadperf lsapi32 lz32 mapi32 mgmtapi mpr msacm32 msvfw32 nddeapi netapi32 ole32 oleaut32 oledlg olepro32 opengl32 pdh pkpd32 rasapi32 rasdlg rassapi rpcrt4 setupapi shell32 shfolder snmpapi sporder tapi32 url user32 vdmdbg version win32spl winmm wintrust wsock32,;t t
+s,@COMPILE_C@,$$(CC) $$(CFLAGS) $$(CPPFLAGS) -c $$(<:/=\),;t t
+s,@COMPILE_CXX@,$$(CXX) $$(CXXFLAGS) $$(CPPFLAGS) -P -c $$(<:/=\),;t t
+s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: .%s.%s:,;t t
+s,@COMMON_LIBS@,m,;t t
 s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN;t t
 s,@COMMON_HEADERS@,winsock2.h windows.h,;t t
 s,@TRY_LINK@,$$(CC) -oconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(LIBPATH) $$(LDFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS),;t t
@@ -402,9 +389,9 @@ s,@srcdir@,$(srcdir),;t t
 s,@top_srcdir@,$(srcdir),;t t
 |
 
-miniruby$(EXEEXT):
+miniruby$(EXEEXT):	$(LIBRUBY_A) $(MAINOBJ) dmyext.obj
 		@echo $(LIBS)
-		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(MINIOBJS),$@,nul,$(LIBRUBY_A) $(LIBS)
+		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) dmyext.obj,$@,nul,$(LIBRUBY_A) $(LIBS)
 
 $(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
 		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBY_INSTALL_NAME).res
@@ -412,21 +399,90 @@ $(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
 $(WPROGRAM):	$(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
 		$(LD) $(LDFLAGS) $(WLDFLAGS) $(MAINOBJ) $(WINMAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBYW_INSTALL_NAME).res
 
-$(LIBRUBY_A):	$(OBJS) $(DMYEXT)
+$(LIBRUBY_A):	$(OBJS) dmyext.obj
 		@-if exist $@ del $@
-		$(AR) $(ARFLAGS) "$@" $(OBJS) $(DMYEXT)
+		$(AR) $(ARFLAGS) "$@" $(OBJS) dmyext.obj
 
 # $(LIBRUBY):	$(LIBRUBY_SO)
 #		implib $@ $(LIBRUBY_SO)
 
-$(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
-		@echo $(DLDOBJS)
-		$(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(DLDOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res
-
-$(LIBRUBY): $(LIBRUBY_SO)
-
-$(RUBYDEF):	$(LIBRUBY_A) $(PREP)
-		$(MINIRUBY) $(srcdir)bcc32/mkexports.rb -output=$@ -base=$(RUBY_SO_NAME) $(LIBRUBY_A)
+$(LIBRUBY_SO) $(LIBRUBY): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
+		@echo $(EXTOBJS)
+		$(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(EXTOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res
+
+$(RUBYDEF):	$(LIBRUBY_A) miniruby$(EXEEXT)
+		$(MINIRUBY) $(srcdir)bcc32/mkexports.rb -output=$@ $(LIBRUBY_A)
+
+install:	rbconfig.rb
+		$(MINIRUBY) $(srcdir)instruby.rb $(SCRIPT_ARGS)
+		$(MINIRUBY) $(srcdir)ext/extmk.rb $(SCRIPT_ARGS) install
+
+what-where no-install:	rbconfig.rb
+		$(MINIRUBY) $(srcdir)instruby.rb -n $(SCRIPT_ARGS)
+		$(MINIRUBY) $(srcdir)ext/extmk.rb -n $(SCRIPT_ARGS) install
+
+clean:		clean-ext clean-local
+
+clean-local:
+		@if exist $(LIBRUBY_A) del $(LIBRUBY_A)
+		@if exist $(MAINOBJ) del $(MAINOBJ)
+		@if exist rbconfig.rb del rbconfig.rb
+		@if exist ext\extinit.c del ext\extinit.c
+		@if exist ext\extinit.obj del ext\extinit.obj
+		@if exist ext\vc*.pdb del ext\vc*.pdb
+		@if exist *.obj del *.obj
+		@if exist *.res del *.res
+		@if exist *.tds del *.tds
+		@if exist *.il? del *.il?
+
+clean-ext:
+		@-$(MINIRUBY) $(srcdir)ext/extmk.rb $(SCRIPT_ARGS) clean
+
+distclean:	distclean-ext distclean-local
+
+distclean-local:	clean-local
+		@if exist Makefile del Makefile
+		@if exist config.h del config.h
+		@if exist ext\config.cache del ext\config.cache
+		@if exist config.cache del config.cache
+		@if exist config.log del config.log
+		@if exist config.status del config.status
+		@if exist *~ del *~
+		@if exist *.bak del *.bak
+		@if exist *.stackdump del *.stackdump
+		@if exist *.core del *.core
+		@if exist gmon.out del gmon.out
+		@if exist y.tab.c del y.tab.c
+		@if exist y.output del y.output
+		@if exist *.map del *.map
+		@if exist *.pdb del *.pdb
+		@if exist *.ilk del *.ilk
+		@if exist *.exp del *.exp
+		@if exist $(RUBYDEF) del $(RUBYDEF)
+		@if exist $(RUBY_INSTALL_NAME).rc del $(RUBY_INSTALL_NAME).rc
+		@if exist $(RUBYW_INSTALL_NAME).rc del $(RUBYW_INSTALL_NAME).rc
+		@if exist $(RUBY_SO_NAME).rc del $(RUBY_SO_NAME).rc
+		@if exist $(PROGRAM) del $(PROGRAM)
+		@if exist $(WPROGRAM) del $(WPROGRAM)
+		@if exist $(LIBRUBY_SO) del $(LIBRUBY_SO)
+		@if exist $(LIBRUBY) del $(LIBRUBY)
+		@if exist ext\nul if not exist ext\* rmdir ext
+		@if exist miniruby$(EXEEXT) del miniruby$(EXEEXT)
+
+distclean-ext:
+		@-$(MINIRUBY) $(srcdir)ext/extmk.rb $(SCRIPT_ARGS) distclean
+
+realclean:	distclean
+		@if exist parse.c del parse.c
+		@if exist lex.c del lex.c
+
+test:		miniruby$(EXEEXT) NUL
+		@$(MINIRUBY) $(srcdir)rubytest.rb
+
+rbconfig.rb:	miniruby$(EXEEXT) config.status
+		@$(MINIRUBY) $(srcdir)mkconfig.rb -srcdir=$(srcdir) \
+			-install_name=$(RUBY_INSTALL_NAME) \
+			-so_name=$(RUBY_SO_NAME) rbconfig.rb
 
 $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
 		@$(MINIRUBY) $(srcdir)win32/resource.rb \
@@ -435,56 +491,95 @@ $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
 			-so_name=$(RUBY_SO_NAME) \
 			. $(icondirs) $(srcdir)win32
 
-post-install-ext::
-	$(MINIRUBY) -I$(srcdir)lib -rrbconfig -rfileutils \
-		-e "FileUtils.rm_f(Dir[ARGV[0]+Config::CONFIG['archdir']+'/**/*.tds'])" "$(DESTDIR:\=/)"
+#config.status:	$(srcdir)configure
+#		$(SHELL) .config.status --recheck
 
-clean-local::
-		@$(RM) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib
-		@$(RM) $(RUBY_INSTALL_NAME).res $(RUBYW_INSTALL_NAME).res $(RUBY_SO_NAME).res
+.path.c = .;$(srcdir);$(srcdir)win32;$(srcdir)missing
+.path.h = .;$(srcdir);$(srcdir)win32;$(srcdir)missing
+.path.y = $(srcdir)
+
+.c.obj:
+	$(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) -c $(<:/=\)
+
+.rc.res:
+	$(RC) $(RFLAGS) -I. -I$(<D). $(iconinc) -I$(srcdir)win32 $(RFLAGS) -fo$@ $(<:/=\)
+
+.y.c:
+	$(YACC) $(YFLAGS) $(<:\=/)
+	sed -e "s!^ *extern char \*getenv();!/* & */!;s/^\(#.*\)y\.tab/\1parse/" y.tab.c > $(@F)
+	@del y.tab.c
 
-distclean-local::
-		@$(RM) ext\config.cache $(RBCONFIG:/=\)
-		@$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF)
-		@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
+parse.c: parse.y
 
 ext/extinit.obj: ext/extinit.c $(SETUP)
 	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -o$@ -c ext/extinit.c
 
-main.$(OBJEXT): win32.h
-array.$(OBJEXT): win32.h
-bignum.$(OBJEXT): win32.h
-class.$(OBJEXT): win32.h
-compar.$(OBJEXT): win32.h
-dir.$(OBJEXT): dir.h win32.h
-dln.$(OBJEXT): win32.h
-enum.$(OBJEXT): win32.h
-error.$(OBJEXT): win32.h
-eval.$(OBJEXT): win32.h
-file.$(OBJEXT): win32.h
-gc.$(OBJEXT): win32.h
-hash.$(OBJEXT): win32.h
-inits.$(OBJEXT): win32.h
-io.$(OBJEXT): win32.h
-marshal.$(OBJEXT): win32.h
-math.$(OBJEXT): win32.h
-numeric.$(OBJEXT): win32.h
-object.$(OBJEXT): win32.h
-pack.$(OBJEXT): win32.h
-parse.$(OBJEXT): win32.h
-process.$(OBJEXT): win32.h
-prec.$(OBJEXT): win32.h
-random.$(OBJEXT): win32.h
-range.$(OBJEXT): win32.h
-re.$(OBJEXT): win32.h
-regex.$(OBJEXT): win32.h
-ruby.$(OBJEXT): win32.h
-signal.$(OBJEXT): win32.h
-sprintf.$(OBJEXT): win32.h
-st.$(OBJEXT): win32.h
-string.$(OBJEXT): win32.h
-struct.$(OBJEXT): win32.h
-time.$(OBJEXT): win32.h
-util.$(OBJEXT): win32.h
-variable.$(OBJEXT): win32.h
-version.$(OBJEXT): win32.h
+acosh.obj: acosh.c win32.h
+alloca.obj: alloca.c win32.h
+crypt.obj: crypt.c win32.h
+dup2.obj: dup2.c win32.h
+erf.obj: erf.c win32.h
+finite.obj: finite.c win32.h
+flock.obj: flock.c win32.h
+memcmp.obj: memcmp.c win32.h
+memmove.obj: memmove.c win32.h
+mkdir.obj: mkdir.c win32.h
+vsnprintf.obj: vsnprintf.c win32.h
+strcasecmp.obj: strcasecmp.c win32.h
+strncasecmp.obj: strncasecmp.c win32.h
+strchr.obj: strchr.c win32.h
+strdup.obj: strdup.c win32.h
+strerror.obj: strerror.c win32.h
+strftime.obj: strftime.c win32.h
+strstr.obj: strstr.c win32.h
+strtod.obj: strtod.c win32.h
+strtol.obj: strtol.c win32.h
+strtoul.obj: strtoul.c win32.h
+nt.obj: nt.c win32.h
+x68.obj: x68.c win32.h
+os2.obj: os2.c win32.h
+dl_os2.obj: dl_os2.c win32.h
+
+# when I use -I., there is confliction at "OpenFile" 
+# so, set . into environment varible "include"
+win32.obj: win32.c win32.h
+
+###
+array.obj: array.c ruby.h config.h defines.h intern.h missing.h util.h st.h win32.h
+bignum.obj: bignum.c ruby.h config.h defines.h intern.h missing.h win32.h
+class.obj: class.c ruby.h config.h defines.h intern.h missing.h rubysig.h node.h st.h win32.h
+compar.obj: compar.c ruby.h config.h defines.h intern.h missing.h win32.h
+dir.obj: dir.c ruby.h config.h defines.h intern.h missing.h util.h win32.h
+dln.obj: dln.c ruby.h config.h defines.h intern.h missing.h dln.h win32.h
+dmyext.obj: dmyext.c
+enum.obj: enum.c ruby.h config.h defines.h intern.h missing.h node.h util.h win32.h
+error.obj: error.c ruby.h config.h defines.h intern.h missing.h env.h st.h win32.h
+eval.obj: eval.c ruby.h config.h defines.h intern.h missing.h node.h env.h util.h rubysig.h st.h dln.h win32.h
+file.obj: file.c ruby.h config.h defines.h intern.h missing.h rubyio.h rubysig.h util.h dln.h win32.h
+gc.obj: gc.c ruby.h config.h defines.h intern.h missing.h rubysig.h st.h node.h env.h re.h regex.h win32.h
+hash.obj: hash.c ruby.h config.h defines.h intern.h missing.h st.h util.h rubysig.h win32.h
+inits.obj: inits.c ruby.h config.h defines.h intern.h missing.h win32.h
+io.obj: io.c ruby.h config.h defines.h intern.h missing.h rubyio.h rubysig.h env.h util.h win32.h
+main.obj: main.c ruby.h config.h defines.h intern.h missing.h win32.h
+marshal.obj: marshal.c ruby.h config.h defines.h intern.h missing.h rubyio.h st.h util.h win32.h
+math.obj: math.c ruby.h config.h defines.h intern.h missing.h win32.h
+numeric.obj: numeric.c ruby.h config.h defines.h intern.h missing.h win32.h
+object.obj: object.c ruby.h config.h defines.h intern.h missing.h st.h util.h win32.h
+pack.obj: pack.c ruby.h config.h defines.h intern.h missing.h win32.h
+parse.obj: parse.c ruby.h config.h defines.h intern.h missing.h env.h node.h st.h regex.h util.h lex.c win32.h
+prec.obj: prec.c ruby.h config.h defines.h intern.h missing.h win32.h
+process.obj: process.c ruby.h config.h defines.h intern.h missing.h rubysig.h st.h win32.h
+random.obj: random.c ruby.h config.h defines.h intern.h missing.h win32.h
+range.obj: range.c ruby.h config.h defines.h intern.h missing.h win32.h
+re.obj: re.c ruby.h config.h defines.h intern.h missing.h re.h regex.h win32.h
+regex.obj: regex.c config.h regex.h win32.h
+ruby.obj: ruby.c ruby.h config.h defines.h intern.h missing.h dln.h node.h util.h win32.h
+signal.obj: signal.c ruby.h config.h defines.h intern.h missing.h rubysig.h win32.h
+sprintf.obj: sprintf.c ruby.h config.h defines.h intern.h missing.h win32.h
+st.obj: st.c config.h st.h
+string.obj: string.c ruby.h config.h defines.h intern.h missing.h re.h regex.h win32.h
+struct.obj: struct.c ruby.h config.h defines.h intern.h missing.h win32.h
+time.obj: time.c ruby.h config.h defines.h intern.h missing.h win32.h
+util.obj: util.c ruby.h config.h defines.h intern.h missing.h util.h win32.h
+variable.obj: variable.c ruby.h config.h defines.h intern.h missing.h env.h node.h st.h util.h win32.h
+version.obj: version.c ruby.h config.h defines.h intern.h missing.h version.h win32.h
diff --git a/bcc32/README.bcc32 b/bcc32/README.bcc32
index c27a1261f1..a699d34a4e 100644
--- a/bcc32/README.bcc32
+++ b/bcc32/README.bcc32
@@ -6,26 +6,18 @@
 
 (1) Borland C++ 5.0 or later.
 
-(2) Please set environment variable (({PATH}))
+(2) If you want to run `((%make clean%))' or `((%make distclean%))'
+    properly, you must install UNIX compatible `((%rm%))' command on
+    your ((|PATH|)).
+
+(3) Please set environment variable (({INCLUDE})), (({LIB})), (({PATH}))
     to run required commands properly from the command line.
 
     Note: building ruby requires following commands.
      * make
-     * bcc32
+     * bcc
      * tlib
-     * ilink32
-
-(3) If you want to build from CVS source, following commands are required.
-     * byacc ((<URL:http://gnuwin32.sourceforge.net/packages/byacc.htm>))
-     * sed   ((<URL:http://gnuwin32.sourceforge.net/packages/sed.htm>))
-
-(4) We strongly recommend to build ruby on C++Builder, to link following files.
-     * usebormm.lib
-     * memmgr.lib
-
-    RTL's internal memory manager cannot handle large memory block properly,
-    so we should use borlndmm.dll instead.
-     10000.times { "" << "." * 529671; GC.start } # crash
+     * ilink
 
 == How to compile and install
 
@@ -56,10 +48,6 @@
     If Ruby's version is `x.y.z', the ((|<MAJOR>|)) is `x' and the ((|<MINOR>|)) is `y'.
     The ((|<PLATFORM>|)) is usually `(({i586-bccwin32}))'.
 
-(6) Requires dynamic RTL (cc3250.dll on C++Builder5) and borlndmm.dll (If built with
-    usebormm.lib) to use installed binary. These files are ordinary in bcc32's bin
-    directory.
-
 == Icons
 
 Any icon files(*.ico) in the build directory, directories specified with
diff --git a/bcc32/configure.bat b/bcc32/configure.bat
index 123a3f23c8..449b6e25b5 100755..100644
--- a/bcc32/configure.bat
+++ b/bcc32/configure.bat
@@ -8,85 +8,25 @@ echo>> ~tmp~.mak conf = %0
 echo>> ~tmp~.mak $(conf:\=/): nul
 echo>> ~tmp~.mak 	@del ~tmp~.mak
 echo>> ~tmp~.mak 	@-$(MAKE) -l$(MAKEFLAGS) -f $(@D)setup.mak \
+echo>> ~tmp~.mak 	bcc32dir="$(@D)" \
 :loop
 if "%1" == "" goto :end
-if "%1" == "--prefix" goto :prefix
 if "%1" == "--srcdir" goto :srcdir
 if "%1" == "srcdir" goto :srcdir
 if "%1" == "--target" goto :target
 if "%1" == "target" goto :target
-if "%1" == "--with-static-linked-ext" goto :extstatic
-if "%1" == "--program-suffix" goto :suffix
-if "%1" == "--program-name" goto :progname
-if "%1" == "--enable-install-doc" goto :enable-rdoc
-if "%1" == "--disable-install-doc" goto :disable-rdoc
-if "%1" == "--extout" goto :extout
-if "%1" == "-h" goto :help
-if "%1" == "--help" goto :help
-  echo>> ~tmp~.mak 	"%1" \
+  echo>> ~tmp~.mak 	"%1" 
   shift
 goto :loop
 :srcdir
-  echo>> ~tmp~.mak 	-D"srcdir=%2" \
-  shift
-  shift
-goto :loop
-:prefix
-  echo>> ~tmp~.mak 	-D"prefix=%2" \
-  shift
-  shift
-goto :loop
-:suffix
-  echo>> ~tmp~.mak 	-D"RUBY_SUFFIX=%2" \
-  shift
-  shift
-goto :loop
-:installname
-  echo>> ~tmp~.mak 	-D"RUBY_INSTALL_NAME=%2" \
-  shift
-  shift
-goto :loop
-:soname
-  echo>> ~tmp~.mak 	-D"RUBY_SO_NAME=%2" \
+  echo>> ~tmp~.mak 	"srcdir=%2" 
   shift
   shift
 goto :loop
 :target
-  echo>> ~tmp~.mak 	"%2" \
-  shift
-  shift
-goto :loop
-:extstatic
-  echo>> ~tmp~.mak 	-D"EXTSTATIC=static" \
-  shift
-goto :loop
-:enable-rdoc
-  echo>> ~tmp~.mak 	-D"RDOCTARGET=install-doc" \
-  shift
-goto :loop
-:disable-rdoc
-  echo>> ~tmp~.mak 	-D"RDOCTARGET=install-nodoc" \
-  shift
-goto :loop
-:extout
-  echo>> ~tmp~.mak 	"EXTOUT=%2" \
+  echo>> ~tmp~.mak 	%2 
   shift
   shift
 goto :loop
-:help
-  echo Configuration:
-  echo   --help                  display this help
-  echo   --srcdir=DIR            find the sources in DIR [configure dir or `..']
-  echo Installation directories:
-  echo   --prefix=PREFIX         install files in PREFIX (ignored currently)
-  echo System types:
-  echo   --target=TARGET         configure for TARGET [i386-bccwin32]
-  echo Optional Package:
-  echo   --with-static-linked-ext link external modules statically
-  echo   --enable-install-doc    install rdoc indexes during install
-  del ~tmp~.mak
-goto :exit
 :end
-echo>> ~tmp~.mak 	bcc32dir="$(@D)"
 make -s -f ~tmp~.mak
-:exit
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
index 1c922c208f..3b37b92fa8 100644
--- a/bcc32/setup.mak
+++ b/bcc32/setup.mak
@@ -9,12 +9,10 @@ srcdir = $(bcc32dir:/bcc32/=/)
 !else
 srcdir = $(bcc32dir)../
 !endif
-!ifndef prefix
-prefix = /usr
-!endif
+
 OS = bccwin32
 RT = $(OS)
-BANG = !
+INCLUDE = !include
 APPEND = echo>>$(MAKEFILE)
 !ifdef MAKEFILE
 MAKE = $(MAKE) -f $(MAKEFILE)
@@ -34,34 +32,8 @@ alpha-$(OS): -prologue- -alpha- -epilogue-
 	@echo Creating $(MAKEFILE)
 	@type > $(MAKEFILE) &&|
 \#\#\# Makefile for ruby $(OS) \#\#\#
-$(BANG)ifndef srcdir
 srcdir = $(srcdir:\=/)
-$(BANG)endif
-$(BANG)ifndef prefix
-prefix = $(prefix:\=/)
-$(BANG)endif
-$(BANG)ifndef EXTSTATIC
-EXTSTATIC = $(EXTSTATIC)
-$(BANG)endif
-!if defined(RDOCTARGET)
-$(BANG)ifndef RDOCTARGET
-RDOCTARGET = $(RDOCTARGET)
-$(BANG)endif
-!endif
-!if defined(EXTOUT)
-$(BANG)ifndef EXTOUT
-EXTOUT = $(EXTOUT)
-$(BANG)endif
-!endif
-|
-	@type > usebormm.bat &&|
-@echo off
-ilink32 -Gn -x usebormm.lib > nul
-if exist usebormm.tds echo MEMLIB = usebormm.lib
 |
-	@usebormm.bat >> $(MAKEFILE)
-	@del usebormm.*
-
 	@cpp32 -I$(srcdir) -DRUBY_EXTERN="//" -P- -o$(MAKEFILE) > nul &&|
 \#include "version.h"
 MAJOR = RUBY_VERSION_MAJOR
@@ -75,44 +47,28 @@ TEENY = RUBY_VERSION_TEENY
 !if defined(PROCESSOR_ARCHITECTURE) ||  defined(PROCESSOR_LEVEL)
 	@type >> $(MAKEFILE) &&|
 !if defined(PROCESSOR_ARCHITECTURE)
-$(BANG)ifndef PROCESSOR_ARCHITECTURE
 PROCESSOR_ARCHITECTURE = $(PROCESSOR_ARCHITECTURE)
-$(BANG)endif
 !endif
 !if defined(PROCESSOR_LEVEL)
-$(BANG)ifndef PROCESSOR_LEVEL
 PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
-$(BANG)endif
 !endif
 
 |
 !endif
 
 -alpha-: nul
-	@$(APPEND) !ifndef PROCESSOR_ARCHITECTURE
 	@$(APPEND) PROCESSOR_ARCHITECTURE = alpha
-	@$(APPEND) !endif
 -ix86-: nul
-	@$(APPEND) !ifndef PROCESSOR_ARCHITECTURE
 	@$(APPEND) PROCESSOR_ARCHITECTURE = x86
-	@$(APPEND) !endif
 
 -i386-: -ix86-
-	@$(APPEND) !ifndef PROCESSOR_LEVEL
 	@$(APPEND) PROCESSOR_LEVEL = 3
-	@$(APPEND) !endif
 -i486-: -ix86-
-	@$(APPEND) !ifndef PROCESSOR_LEVEL
 	@$(APPEND) PROCESSOR_LEVEL = 4
-	@$(APPEND) !endif
 -i586-: -ix86-
-	@$(APPEND) !ifndef PROCESSOR_LEVEL
 	@$(APPEND) PROCESSOR_LEVEL = 5
-	@$(APPEND) !endif
 -i686-: -ix86-
-	@$(APPEND) !ifndef PROCESSOR_LEVEL
 	@$(APPEND) PROCESSOR_LEVEL = 6
-	@$(APPEND) !endif
 
 -epilogue-: nul
 	@type >> $(MAKEFILE) &&|
@@ -121,13 +77,13 @@ $(BANG)endif
 \# RT = $(RT)
 \# RUBY_INSTALL_NAME = ruby
 \# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR)
+\# prefix = /usr
 \# CFLAGS = -q $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
 \# CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\"
 \# STACK = 0x2000000
 \# LDFLAGS = -S:$$(STACK)
 \# RFLAGS = $$(iconinc)
 \# EXTLIBS = cw32.lib import32.lib user32.lib kernel32.lib
-$(BANG)include $$(srcdir)bcc32/Makefile.sub
+$(INCLUDE) $$(srcdir)bcc32/Makefile.sub
 |
-	@$(srcdir:/=\)\win32\rm.bat config.h config.status
 	@echo type "`$(MAKE)'" to make ruby for $(OS).
diff --git a/bignum.c b/bignum.c
index 3057f1d45a..06228416bf 100644
--- a/bignum.c
+++ b/bignum.c
@@ -2,8 +2,8 @@
 
   bignum.c -
 
-  $Author: shyouhei $
-  $Date: 2006/12/06 10:14:12 $
+  $Author$
+  $Date$
   created at: Fri Jun 10 00:48:55 JST 1994
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -42,11 +42,11 @@ static VALUE
 bignew_1(klass, len, sign)
     VALUE klass;
     long len;
-    int sign;
+    char sign;
 {
     NEWOBJ(big, struct RBignum);
     OBJSETUP(big, klass, T_BIGNUM);
-    big->sign = sign?1:0;
+    big->sign = sign;
     big->len = len;
     big->digits = ALLOC_N(BDIGIT, len);
 
@@ -65,10 +65,10 @@ rb_big_clone(x)
     return z;
 }
 
-/* modify a bignum by 2's complement */
 static void
-get2comp(x)
+get2comp(x, carry)		/* get 2's complement */
     VALUE x;
+    int carry;
 {
     long i = RBIGNUM(x)->len;
     BDIGIT *ds = BDIGITS(x);
@@ -81,10 +81,11 @@ get2comp(x)
 	ds[i++] = BIGLO(num);
 	num = BIGDN(num);
     } while (i < RBIGNUM(x)->len);
-    if (num != 0) {
+    if (!carry) return;
+    if ((ds[RBIGNUM(x)->len-1] & (1<<(BITSPERDIG-1))) == 0) {
 	REALLOC_N(RBIGNUM(x)->digits, BDIGIT, ++RBIGNUM(x)->len);
 	ds = BDIGITS(x);
-	ds[RBIGNUM(x)->len-1] = RBIGNUM(x)->sign ? ~0 : 1;
+	ds[RBIGNUM(x)->len-1] = ~0;
     }
 }
 
@@ -92,17 +93,14 @@ void
 rb_big_2comp(x)			/* get 2's complement */
     VALUE x;
 {
-    get2comp(x);
+    get2comp(x, Qtrue);
 }
 
 static VALUE
 bignorm(x)
     VALUE x;
 {
-    if (FIXNUM_P(x)) {
-      return x;
-    }
-    else if (TYPE(x) == T_BIGNUM) {
+    if (!FIXNUM_P(x)) {
 	long len = RBIGNUM(x)->len;
 	BDIGIT *ds = BDIGITS(x);
 
@@ -750,17 +748,6 @@ big2ulong(x, type)
 }
 
 unsigned long
-rb_big2ulong_pack(x)   
-    VALUE x;  
-{   
-    unsigned long num = big2ulong(x, "unsigned long");
-    if (!RBIGNUM(x)->sign) {
-	return -num;
-    }
-    return num;
-}  
-
-unsigned long
 rb_big2ulong(x)
     VALUE x;
 {
@@ -982,8 +969,8 @@ rb_big_eq(x, y)
 	    volatile double a, b;
 
 	    a = RFLOAT(y)->value;
-	    if (isnan(a)) return Qfalse;
 	    b = rb_big2dbl(x);
+	    if (isnan(a) || isnan(b)) return Qfalse;
 	    return (a == b)?Qtrue:Qfalse;
 	}
       default:
@@ -1052,15 +1039,13 @@ rb_big_neg(x)
     VALUE x;
 {
     VALUE z = rb_big_clone(x);
-    long i;
-    BDIGIT *ds;
+    long i = RBIGNUM(x)->len;
+    BDIGIT *ds = BDIGITS(z);
 
-    if (!RBIGNUM(x)->sign) get2comp(z);
-    ds = BDIGITS(z);
-    i = RBIGNUM(x)->len;
+    if (!RBIGNUM(x)->sign) get2comp(z, Qtrue);
     while (i--) ds[i] = ~ds[i];
+    if (RBIGNUM(x)->sign) get2comp(z, Qfalse);
     RBIGNUM(z)->sign = !RBIGNUM(z)->sign;
-    if (RBIGNUM(x)->sign) get2comp(z);
 
     return bignorm(z);
 }
@@ -1091,7 +1076,7 @@ bigsub(x, y)
 	}
     }
 
-    z = bignew(RBIGNUM(x)->len, z==0);
+    z = bignew(RBIGNUM(x)->len, (z == 0)?1:0);
     zds = BDIGITS(z);
 
     for (i = 0, num = 0; i < RBIGNUM(y)->len; i++) { 
@@ -1115,7 +1100,7 @@ bigsub(x, y)
 static VALUE
 bigadd(x, y, sign)
     VALUE x, y;
-    int sign;
+    char sign;
 {
     VALUE z;
     BDIGIT_DBL num;
@@ -1609,11 +1594,6 @@ rb_big_pow(x, y)
 	if (yy > 0) {
 	    VALUE z = x;
 
-	    if (RBIGNUM(x)->len * SIZEOF_BDIGITS * yy > 1024*1024) {
-		rb_warn("in a**b, b may be too big");
-		d = (double)yy;
-		break;
-	    }
 	    for (;;) {
 		yy -= 1;
 		if (yy == 0) break;
@@ -1657,11 +1637,11 @@ rb_big_and(xx, yy)
     }
     if (!RBIGNUM(y)->sign) {
 	y = rb_big_clone(y);
-	get2comp(y);
+	get2comp(y, Qtrue);
     }
     if (!RBIGNUM(x)->sign) {
 	x = rb_big_clone(x);
-	get2comp(x);
+	get2comp(x, Qtrue);
     }
     if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
 	l1 = RBIGNUM(y)->len;
@@ -1686,7 +1666,7 @@ rb_big_and(xx, yy)
     for (; i<l2; i++) {
 	zds[i] = sign?0:ds2[i];
     }
-    if (!RBIGNUM(z)->sign) get2comp(z);
+    if (!RBIGNUM(z)->sign) get2comp(z, Qfalse);
     return bignorm(z);
 }
 
@@ -1711,13 +1691,14 @@ rb_big_or(xx, yy)
     if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
     }
+
     if (!RBIGNUM(y)->sign) {
 	y = rb_big_clone(y);
-	get2comp(y);
+	get2comp(y, Qtrue);
     }
     if (!RBIGNUM(x)->sign) {
 	x = rb_big_clone(x);
-	get2comp(x);
+	get2comp(x, Qtrue);
     }
     if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
 	l1 = RBIGNUM(y)->len;
@@ -1742,7 +1723,7 @@ rb_big_or(xx, yy)
     for (; i<l2; i++) {
 	zds[i] = sign?ds2[i]:(BIGRAD-1);
     }
-    if (!RBIGNUM(z)->sign) get2comp(z);
+    if (!RBIGNUM(z)->sign) get2comp(z, Qfalse);
 
     return bignorm(z);
 }
@@ -1769,13 +1750,14 @@ rb_big_xor(xx, yy)
     if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
     }
+
     if (!RBIGNUM(y)->sign) {
 	y = rb_big_clone(y);
-	get2comp(y);
+	get2comp(y, Qtrue);
     }
     if (!RBIGNUM(x)->sign) {
 	x = rb_big_clone(x);
-	get2comp(x);
+	get2comp(x, Qtrue);
     }
     if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
 	l1 = RBIGNUM(y)->len;
@@ -1802,7 +1784,7 @@ rb_big_xor(xx, yy)
     for (; i<l2; i++) {
 	zds[i] = sign?ds2[i]:~ds2[i];
     }
-    if (!RBIGNUM(z)->sign) get2comp(z);
+    if (!RBIGNUM(z)->sign) get2comp(z, Qfalse);
 
     return bignorm(z);
 }
@@ -1863,7 +1845,6 @@ rb_big_rshift(x, y)
     VALUE z;
     BDIGIT_DBL num = 0;
     long i, j;
-    volatile VALUE save_x;
 
     if (shift < 0) return rb_big_lshift(x, INT2FIX(-shift));
 
@@ -1874,8 +1855,8 @@ rb_big_rshift(x, y)
 	    return INT2FIX(-1);
     }
     if (!RBIGNUM(x)->sign) {
-	save_x = x = rb_big_clone(x);
-	get2comp(x);
+	x = rb_big_clone(x);
+	get2comp(x, Qtrue);
     }
     xds = BDIGITS(x);
     i = RBIGNUM(x)->len; j = i - s1;
@@ -1890,7 +1871,7 @@ rb_big_rshift(x, y)
 	num = BIGUP(xds[i]);
     }
     if (!RBIGNUM(x)->sign) {
-	get2comp(z);
+	get2comp(z, Qfalse);
     }
     return bignorm(z);
 }
@@ -1935,7 +1916,7 @@ rb_big_aref(x, y)
     if (!RBIGNUM(x)->sign) {
 	if (s1 >= RBIGNUM(x)->len) return INT2FIX(1);
 	x = rb_big_clone(x);
-	get2comp(x);
+	get2comp(x, Qtrue);
     }
     else {
 	if (s1 >= RBIGNUM(x)->len) return INT2FIX(0);
@@ -1978,11 +1959,8 @@ rb_big_coerce(x, y)
     if (FIXNUM_P(y)) {
 	return rb_assoc_new(rb_int2big(FIX2LONG(y)), x);
     }
-    else if (TYPE(y) == T_BIGNUM) {
-       return rb_assoc_new(y, x);
-    }
     else {
-	rb_raise(rb_eTypeError, "can't coerce %s to Bignum",
+	rb_raise(rb_eTypeError, "Can't coerce %s to Bignum",
 		 rb_obj_classname(y));
     }
     /* not reached */
@@ -2021,13 +1999,11 @@ rb_big_rand(max, rand_buf)
 	return rb_float_new(rand_buf[0]);
     }
     v = bignew(len,1);
-    len--;
-    BDIGITS(v)[len] = BDIGITS(max)[len] * rand_buf[len];    
     while (len--) {
 	BDIGITS(v)[len] = ((BDIGIT)~0) * rand_buf[len];
     }
 
-    return v;
+    return rb_big_modulo((VALUE)v, max);
 }
 
 /*
diff --git a/bin/erb b/bin/erb
index a6fcd5370c..2459d2562e 100755
--- a/bin/erb
+++ b/bin/erb
@@ -12,13 +12,13 @@ class ERB
       arg = self.shift
       return nil if arg == '--'
       if arg =~ /^-(.)(.*)/
-        return arg if $1 == '-'
-        raise 'unknown switch "-"' if $2.index('-')
-        self.unshift "-#{$2}" if $2.size > 0
-        "-#{$1}"
+	return arg if $1 == '-'
+	raise 'unknown switch "-"' if $2.index('-')
+	self.unshift "-#{$2}" if $2.size > 0
+	"-#{$1}"
       else
-        self.unshift arg
-        nil
+	self.unshift arg
+	nil
       end
     end
     
@@ -30,13 +30,13 @@ class ERB
       return trim_mode if disable_percent
       case trim_mode
       when 0
-        return '%'
+	return '%'
       when 1
-        return '%>'
+	return '%>'
       when 2
-        return '%<>'
+	return '%<>'
       when '-'
-        return '%-'
+	return '%-'
       end
     end
     module_function :trim_mode_opt
@@ -45,91 +45,89 @@ class ERB
       trim_mode = 0
       disable_percent = false
       begin
-        while switch = ARGV.switch
-          case switch
-          when '-x'                        # ruby source
-            output = true
-          when '-n'                        # line number
-            number = true
-          when '-v'                        # verbose
-            $VERBOSE = true
-          when '--version'                 # version
-            STDERR.puts factory.version
-            exit
-          when '-d', '--debug'             # debug
-            $DEBUG = true
-          when '-r'                        # require
-            require ARGV.req_arg
-          when '-S'                        # security level
-            arg = ARGV.req_arg
-            raise "invalid safe_level #{arg.dump}" unless arg =~ /^[0-4]$/
-            safe_level = arg.to_i
-          when '-T'                        # trim mode
-            arg = ARGV.req_arg
-            if arg == '-'
-              trim_mode = arg 
-              next
-            end
-            raise "invalid trim mode #{arg.dump}" unless arg =~ /^[0-2]$/
-            trim_mode = arg.to_i
-          when '-K'                        # KCODE
-            arg = ARGV.req_arg
-            case arg.downcase
-            when 'e', '-e', 'euc'
-              $KCODE = 'EUC'
-            when 's', '-s', 'sjis'
-              $KCODE = 'SJIS'
-            when 'u', '-u', 'utf8'
-              $KCODE = 'UTF8'
-            when 'n', '-n', 'none'
-              $KCODE = 'NONE'
-            else
-              raise "invalid KCODE #{arg.dump}"
-            end
-          when '-P'
-            disable_percent = true
-          when '--help'
-            raise "print this help"
-          else
-            raise "unknown switch #{switch.dump}"
-          end
-        end
-      rescue                               # usage
-        STDERR.puts $!.to_s
-        STDERR.puts File.basename($0) + 
-          " [switches] [inputfile]"
-        STDERR.puts <<EOU
+	while switch = ARGV.switch
+	  case switch
+	  when '-x'			# ruby source
+	    output = true
+	  when '-n'			# line number
+	    number = true
+	  when '-v'			# verbose
+	    $VERBOSE = true
+	  when '--version'		# version
+	    STDERR.puts factory.version
+	    exit
+	  when '-d', '--debug'	# debug
+	    $DEBUG = true
+	  when '-r'			# require
+	    require ARGV.req_arg
+	  when '-S'			# sacurity level
+	    arg = ARGV.req_arg
+	    raise "invalid safe_level #{arg.dump}" unless arg =~ /^[0-4]$/
+	    safe_level = arg.to_i
+	  when '-T'			# trim mode
+	    arg = ARGV.req_arg
+	    if arg == '-'
+	      trim_mode = arg 
+	      next
+	    end
+	    raise "invalid trim mode #{arg.dump}" unless arg =~ /^[0-2]$/
+	    trim_mode = arg.to_i
+	  when '-K'			# KCODE
+	    arg = ARGV.req_arg
+	    case arg.downcase
+	    when 'e', '-e', 'euc'
+	      $KCODE = 'EUC'
+	    when 's', '-s', 'sjis'
+	      $KCODE = 'SJIS'
+	    when 'u', '-u', 'utf8'
+	      $KCODE = 'UTF8'
+	    when 'n', '-n', 'none'
+	      $KCODE = 'NONE'
+	    else
+	      raise "invalid KCODE #{arg.dump}"
+	    end
+	  when '-P'
+	    disable_percent = true
+	  when '--help'
+	    raise "print this help"
+	  else
+	    raise "unknown switch #{switch.dump}"
+	  end
+	end
+      rescue    			# usage
+	STDERR.puts $!.to_s
+	STDERR.puts File.basename($0) + 
+	  " [switches] [inputfile]"
+	STDERR.puts <<EOU
   -x               print ruby script
   -n               print ruby script with line number
   -v               enable verbose mode
-  -d               set $DEBUG to true
+  -d               set $DBEUG to true
   -r [library]     load a library
   -K [kcode]       specify KANJI code-set
   -S [safe_level]  set $SAFE (0..4)
   -T [trim_mode]   specify trim_mode (0..2, -)
-  -P               ignore lines which start with "%"
+  -P               disregard the lin which starts in "%" 
 EOU
-        exit 1
+	exit 1
       end
 
       src = $<.read
-      filename = $FILENAME
       exit 2 unless src
       trim = trim_mode_opt(trim_mode, disable_percent)
       erb = factory.new(src.untaint, safe_level, trim)
-      erb.filename = filename
       if output
-        if number
-          l = 1
-          for line in erb.src
-            puts "%3d %s"%[l, line]
-            l += 1
-          end
-        else
-          puts erb.src
-        end
+	if number
+	  l = 1
+	  for line in erb.src
+	    puts "%3d %s"%[l, line]
+	    l += 1
+	  end
+	else
+	  puts erb.src
+	end
       else
-        erb.run(TOPLEVEL_BINDING.taint)
+	erb.run(TOPLEVEL_BINDING.taint)
       end
     end
     module_function :run
diff --git a/bin/irb b/bin/irb
index 13474a932b..309da52161 100644
--- a/bin/irb
+++ b/bin/irb
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 #
 #   irb.rb - intaractive ruby
-#   	$Release Version: 0.9.5 $
-#   	$Revision: 1.2.2.1 $
-#   	$Date: 2005/04/19 19:24:56 $
-#   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#   	$Release Version: 0.7.3 $
+#   	$Revision$
+#   	$Date$
+#   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 #
 
 require "irb"
diff --git a/bin/rdoc b/bin/rdoc
index d08ce838f6..fe619137fd 100644
--- a/bin/rdoc
+++ b/bin/rdoc
@@ -6,7 +6,7 @@
 #  Copyright (c) 2003 Dave Thomas
 #  Released under the same terms as Ruby
 #
-#  $Revision: 1.1 $
+#  $Revision$
 
 ## Transitional Hack ####
 #
diff --git a/class.c b/class.c
index 9e41b1e260..8addef7612 100644
--- a/class.c
+++ b/class.c
@@ -2,8 +2,8 @@
 
   class.c -
 
-  $Author: nobu $
-  $Date: 2005/09/28 14:42:46 $
+  $Author$
+  $Date$
   created at: Tue Aug 10 15:05:44 JST 1993
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -58,7 +58,6 @@ clone_method(mid, body, tbl)
     return ST_CONTINUE;
 }
 
-/* :nodoc: */
 VALUE
 rb_mod_init_copy(clone, orig)
     VALUE clone, orig;
@@ -86,7 +85,6 @@ rb_mod_init_copy(clone, orig)
     return clone;
 }
 
-/* :nodoc: */
 VALUE
 rb_class_init_copy(clone, orig)
     VALUE clone, orig;
@@ -94,9 +92,6 @@ rb_class_init_copy(clone, orig)
     if (RCLASS(clone)->super != 0) {
 	rb_raise(rb_eTypeError, "already initialized class");
     }
-    if (FL_TEST(orig, FL_SINGLETON)) {
-	rb_raise(rb_eTypeError, "can't copy singleton class");
-    }
     return rb_mod_init_copy(clone, orig);
 }
 
diff --git a/common.mk b/common.mk
deleted file mode 100644
index 3584b83e35..0000000000
--- a/common.mk
+++ /dev/null
@@ -1,305 +0,0 @@
-bin: $(PROGRAM) $(WPROGRAM)
-lib: $(LIBRUBY);
-dll: $(LIBRUBY_SO);
-
-RUBYOPT       =
-
-STATIC_RUBY   = static-ruby
-
-EXTCONF       = extconf.rb
-RBCONFIG      = ./.rbconfig.time
-
-DMYEXT	      = dmyext.$(OBJEXT)
-MAINOBJ	      = main.$(OBJEXT)
-EXTOBJS	      = 
-DLDOBJS	      = $(DMYEXT)
-
-OBJS	      = array.$(OBJEXT) \
-		bignum.$(OBJEXT) \
-		class.$(OBJEXT) \
-		compar.$(OBJEXT) \
-		dir.$(OBJEXT) \
-		dln.$(OBJEXT) \
-		enum.$(OBJEXT) \
-		error.$(OBJEXT) \
-		eval.$(OBJEXT) \
-		file.$(OBJEXT) \
-		gc.$(OBJEXT) \
-		hash.$(OBJEXT) \
-		inits.$(OBJEXT) \
-		io.$(OBJEXT) \
-		marshal.$(OBJEXT) \
-		math.$(OBJEXT) \
-		numeric.$(OBJEXT) \
-		object.$(OBJEXT) \
-		pack.$(OBJEXT) \
-		parse.$(OBJEXT) \
-		process.$(OBJEXT) \
-		prec.$(OBJEXT) \
-		random.$(OBJEXT) \
-		range.$(OBJEXT) \
-		re.$(OBJEXT) \
-		regex.$(OBJEXT) \
-		ruby.$(OBJEXT) \
-		signal.$(OBJEXT) \
-		sprintf.$(OBJEXT) \
-		st.$(OBJEXT) \
-		string.$(OBJEXT) \
-		struct.$(OBJEXT) \
-		time.$(OBJEXT) \
-		util.$(OBJEXT) \
-		variable.$(OBJEXT) \
-		version.$(OBJEXT) \
-		$(MISSING)
-
-SCRIPT_ARGS   =	--dest-dir="$(DESTDIR)" \
-		--make="$(MAKE)" \
-		--mflags="$(MFLAGS)" \
-		--make-flags="$(MAKEFLAGS)"
-EXTMK_ARGS    =	$(SCRIPT_ARGS) --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) --
-
-all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY)
-	@$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS)
-prog: $(PROGRAM) $(WPROGRAM)
-
-miniruby$(EXEEXT): config.status $(LIBRUBY_A) $(MAINOBJ) $(MINIOBJS) $(OBJS) $(DMYEXT)
-
-$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
-
-$(LIBRUBY_A):	$(OBJS) $(DMYEXT) $(ARCHFILE)
-
-$(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP)
-
-$(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
-	@$(RM) $@
-	$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
-
-ruby.imp: $(OBJS)
-	@$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
-
-install: install-nodoc $(RDOCTARGET)
-install-all: install-nodoc install-doc
-
-install-nodoc: install-local install-ext
-install-local: pre-install-local do-install-local post-install-local
-install-ext: pre-install-ext do-install-ext post-install-ext
-
-do-install-local: $(RBCONFIG)
-	$(MINIRUBY) $(srcdir)/instruby.rb $(SCRIPT_ARGS) --mantype="$(MANTYPE)"
-do-install-ext: $(RBCONFIG)
-	$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) install
-
-install-bin: $(RBCONFIG)
-	$(MINIRUBY) $(srcdir)/instruby.rb $(SCRIPT_ARGS) --install=bin
-install-lib: $(RBCONFIG)
-	$(MINIRUBY) $(srcdir)/instruby.rb $(SCRIPT_ARGS) --install=lib
-install-man: $(RBCONFIG)
-	$(MINIRUBY) $(srcdir)/instruby.rb $(SCRIPT_ARGS) --install=man --mantype="$(MANTYPE)"
-
-what-where-all no-install-all: no-install no-install-doc
-what-where no-install: no-install-local no-install-ext
-what-where-local: no-install-local
-no-install-local: $(RBCONFIG)
-	$(MINIRUBY) $(srcdir)/instruby.rb -n $(SCRIPT_ARGS) --mantype="$(MANTYPE)"
-what-where-ext: no-install-ext
-no-install-ext: $(RBCONFIG)
-	$(MINIRUBY) $(srcdir)/ext/extmk.rb -n $(EXTMK_ARGS) install
-
-install-doc: pre-install-doc do-install-doc post-install-doc
-do-install-doc: $(PROGRAM)
-	@echo Generating RDoc documentation
-	$(RUNRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RIDATADIR)" "$(srcdir)"
-
-pre-install: pre-install-local pre-install-ext
-pre-install-local:: PHONY
-	$(PREINSTALL)
-pre-install-ext:: PHONY
-pre-install-doc:: PHONY
-
-post-install: post-install-local post-install-ext
-post-install-local:: PHONY
-post-install-ext:: PHONY
-post-install-doc:: PHONY
-
-clean: clean-ext clean-local
-clean-local::
-	@$(RM) $(OBJS) $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
-	@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE)
-clean-ext:
-	@-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) clean
-
-distclean: distclean-ext distclean-local
-distclean-local:: clean-local
-	@$(RM) $(MKFILES) config.h rbconfig.rb
-	@$(RM) config.cache config.log config.status
-	@$(RM) *~ *.bak *.stackdump core *.core gmon.out y.tab.c y.output $(PREP)
-distclean-ext:
-	@-$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS) distclean
-
-realclean:: distclean
-	@$(RM) parse.c lex.c
-
-check: test test-all
-
-test: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
-	@$(MINIRUBY) $(srcdir)/rubytest.rb
-
-test-all:
-	$(RUNRUBY) -C "$(srcdir)/test" runner.rb --runner=$(TESTUI) $(TESTS)
-
-extconf:
-	$(MINIRUBY) -I$(srcdir)/lib -run -e mkdir -- -p "$(EXTCONFDIR)"
-	$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
-
-$(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(PREP)
-	@$(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \
-		-install_name=$(RUBY_INSTALL_NAME) \
-		-so_name=$(RUBY_SO_NAME) rbconfig.rb
-
-.PRECIOUS: $(MKFILES)
-
-.PHONY: test install install-nodoc install-doc dist
-
-PHONY:
-
-{$(VPATH)}parse.c: parse.y
-
-acosh.$(OBJEXT): {$(VPATH)}acosh.c
-alloca.$(OBJEXT): {$(VPATH)}alloca.c
-crypt.$(OBJEXT): {$(VPATH)}crypt.c
-dup2.$(OBJEXT): {$(VPATH)}dup2.c
-erf.$(OBJEXT): {$(VPATH)}erf.c
-finite.$(OBJEXT): {$(VPATH)}finite.c
-flock.$(OBJEXT): {$(VPATH)}flock.c
-memcmp.$(OBJEXT): {$(VPATH)}memcmp.c
-memmove.$(OBJEXT): {$(VPATH)}memmove.c
-mkdir.$(OBJEXT): {$(VPATH)}mkdir.c
-vsnprintf.$(OBJEXT): {$(VPATH)}vsnprintf.c
-strcasecmp.$(OBJEXT): {$(VPATH)}strcasecmp.c
-strncasecmp.$(OBJEXT): {$(VPATH)}strncasecmp.c
-strchr.$(OBJEXT): {$(VPATH)}strchr.c
-strdup.$(OBJEXT): {$(VPATH)}strdup.c
-strerror.$(OBJEXT): {$(VPATH)}strerror.c
-strftime.$(OBJEXT): {$(VPATH)}strftime.c
-strstr.$(OBJEXT): {$(VPATH)}strstr.c
-strtod.$(OBJEXT): {$(VPATH)}strtod.c
-strtol.$(OBJEXT): {$(VPATH)}strtol.c
-strtoul.$(OBJEXT): {$(VPATH)}strtoul.c
-nt.$(OBJEXT): {$(VPATH)}nt.c
-x68.$(OBJEXT): {$(VPATH)}x68.c
-os2.$(OBJEXT): {$(VPATH)}os2.c
-dl_os2.$(OBJEXT): {$(VPATH)}dl_os2.c
-
-# when I use -I., there is confliction at "OpenFile" 
-# so, set . into environment varible "include"
-win32.$(OBJEXT): {$(VPATH)}win32.c
-
-###
-
-array.$(OBJEXT): {$(VPATH)}array.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}util.h {$(VPATH)}st.h
-bignum.$(OBJEXT): {$(VPATH)}bignum.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-class.$(OBJEXT): {$(VPATH)}class.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubysig.h {$(VPATH)}node.h {$(VPATH)}st.h
-compar.$(OBJEXT): {$(VPATH)}compar.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-dir.$(OBJEXT): {$(VPATH)}dir.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}util.h
-dln.$(OBJEXT): {$(VPATH)}dln.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}dln.h
-dmydln.$(OBJEXT): {$(VPATH)}dmydln.c {$(VPATH)}dln.c {$(VPATH)}ruby.h \
-  config.h {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}dln.h
-dmyext.$(OBJEXT): {$(VPATH)}dmyext.c
-enum.$(OBJEXT): {$(VPATH)}enum.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}node.h {$(VPATH)}util.h
-error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}env.h {$(VPATH)}st.h
-eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}node.h {$(VPATH)}env.h {$(VPATH)}util.h \
-  {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}dln.h
-file.$(OBJEXT): {$(VPATH)}file.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubyio.h {$(VPATH)}rubysig.h {$(VPATH)}util.h \
-  {$(VPATH)}dln.h
-gc.$(OBJEXT): {$(VPATH)}gc.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}node.h \
-  {$(VPATH)}env.h {$(VPATH)}re.h {$(VPATH)}regex.h
-hash.$(OBJEXT): {$(VPATH)}hash.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}st.h {$(VPATH)}util.h {$(VPATH)}rubysig.h
-inits.$(OBJEXT): {$(VPATH)}inits.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-io.$(OBJEXT): {$(VPATH)}io.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubyio.h {$(VPATH)}rubysig.h  {$(VPATH)}util.h \
-  {$(VPATH)}env.h
-main.$(OBJEXT): {$(VPATH)}main.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-marshal.$(OBJEXT): {$(VPATH)}marshal.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubyio.h {$(VPATH)}st.h {$(VPATH)}util.h
-math.$(OBJEXT): {$(VPATH)}math.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-numeric.$(OBJEXT): {$(VPATH)}numeric.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}env.h {$(VPATH)}defines.h {$(VPATH)}intern.h \
-  {$(VPATH)}missing.h
-object.$(OBJEXT): {$(VPATH)}object.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}st.h {$(VPATH)}util.h
-pack.$(OBJEXT): {$(VPATH)}pack.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-parse.$(OBJEXT): {$(VPATH)}parse.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}env.h {$(VPATH)}node.h {$(VPATH)}st.h \
-  {$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c
-prec.$(OBJEXT): {$(VPATH)}prec.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-process.$(OBJEXT): {$(VPATH)}process.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubysig.h {$(VPATH)}st.h
-random.$(OBJEXT): {$(VPATH)}random.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-range.$(OBJEXT): {$(VPATH)}range.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-re.$(OBJEXT): {$(VPATH)}re.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}re.h {$(VPATH)}regex.h
-regex.$(OBJEXT): {$(VPATH)}regex.c config.h {$(VPATH)}regex.h
-ruby.$(OBJEXT): {$(VPATH)}ruby.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}dln.h {$(VPATH)}node.h {$(VPATH)}util.h
-signal.$(OBJEXT): {$(VPATH)}signal.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubysig.h
-sprintf.$(OBJEXT): {$(VPATH)}sprintf.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-st.$(OBJEXT): {$(VPATH)}st.c config.h {$(VPATH)}st.h
-string.$(OBJEXT): {$(VPATH)}string.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}re.h {$(VPATH)}regex.h
-struct.$(OBJEXT): {$(VPATH)}struct.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-time.$(OBJEXT): {$(VPATH)}time.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-util.$(OBJEXT): {$(VPATH)}util.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}util.h
-variable.$(OBJEXT): {$(VPATH)}variable.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}env.h {$(VPATH)}node.h {$(VPATH)}st.h {$(VPATH)}util.h
-version.$(OBJEXT): {$(VPATH)}version.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}version.h
-
-dist: $(PROGRAM)
-	$(RUNRUBY) $(srcdir)/distruby.rb
diff --git a/compar.c b/compar.c
index 3cd3216b77..1488b2c65d 100644
--- a/compar.c
+++ b/compar.c
@@ -2,8 +2,8 @@
 
   compar.c -
 
-  $Author: dave $
-  $Date: 2003/12/19 00:01:18 $
+  $Author$
+  $Date$
   created at: Thu Aug 26 14:39:48 JST 1993
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
diff --git a/configure.in b/configure.in
index b3288f8c03..641954adfe 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT()
 
-AC_PREREQ(2.58)
+AC_PREREQ(2.50)
 
-AC_DEFUN([RUBY_MINGW32],
+AC_DEFUN(RUBY_MINGW32,
 [case "$host_os" in
 cygwin*)
 AC_CACHE_CHECK(for mingw32 environment, rb_cv_mingw32,
@@ -17,7 +17,7 @@ test "$rb_cv_mingw32" = yes && target_os="mingw32"
   ;;
 esac])
 
-AC_DEFUN([RUBY_CPPOUTFILE],
+AC_DEFUN(RUBY_CPPOUTFILE,
 [AC_CACHE_CHECK(whether ${CPP} accepts -o, rb_cv_cppoutfile,
 [cppflags=$CPPFLAGS
 CPPFLAGS='-o conftest.i'
@@ -33,7 +33,7 @@ elif test -n "$rb_cv_cppoutfile"; then
 fi
 AC_SUBST(CPPOUTFILE)])
 
-AC_DEFUN([RUBY_PROG_GNU_LD],
+AC_DEFUN(RUBY_PROG_GNU_LD,
 [AC_CACHE_CHECK(whether the linker is GNU ld, rb_cv_prog_gnu_ld,
 [if `$CC $CFLAGS $CPPFLAGS $LDFLAGS --print-prog-name=ld 2>&1` -v 2>&1 | grep "GNU ld" > /dev/null; then
   rb_cv_prog_gnu_ld=yes
@@ -73,7 +73,6 @@ if test "$program_prefix" = NONE; then
 fi
 AC_CANONICAL_TARGET
 target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`
-ac_install_sh='' # unusable for extension libraries.
 
 dnl checks for fat-binary
 AC_ARG_ENABLE(fat-binary,
@@ -169,38 +168,12 @@ if test -z "$AR"; then
   AC_CHECK_PROGS(AR, aal, ar)
 fi
 
-AC_CHECK_TOOL(AS, as)
-ASFLAGS=$ASFLAGS
-AC_SUBST(ASFLAGS)
-
 case "$target_os" in
 cygwin*|mingw*)
     AC_CHECK_TOOL(NM, nm)
     AC_CHECK_TOOL(WINDRES, windres)
     AC_CHECK_TOOL(DLLWRAP, dllwrap)
     target_cpu=`echo $target_cpu | sed s/i.86/i386/`
-    case "$target_os" in
-    mingw*)
-	test "$rb_cv_msvcrt" = "" && unset rb_cv_msvcrt
-	AC_CHECK_TOOL(OBJDUMP, objdump)
-	AC_CACHE_CHECK(for mingw32 runtime DLL, rb_cv_msvcrt, [
-	AC_TRY_LINK([#include <stdio.h>],
-		    [FILE* volatile f = stdin; return 0;],
-		    [rb_cv_msvcrt=`$OBJDUMP -p conftest$ac_exeext |
-				   tr A-Z a-z |
-				   sed -n '/^[[ 	]]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`],
-		    [rb_cv_msvcrt=msvcrt])
-	test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt])
-	AC_ARG_WITH(winsock2,
-		[  --with-winsock2         link winsock2 (MinGW only)], [
-		case $withval in
-		yes) with_winsock2=yes;;
-		*)   with_winsock2=no;;
-		esac], [with_winsock2=no])
-	if test "$with_winsock2" = yes; then
-	  AC_DEFINE(USE_WINSOCK2)
-	fi
-    esac
     : ${enable_shared=yes}
     ;;
 aix*)
@@ -214,20 +187,11 @@ esac
 
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_PROG_INSTALL
 
 # checks for UNIX variants that set C preprocessor variables
 AC_AIX
 AC_MINIX
 
-AC_SUBST(RM, ['rm -f'])
-AC_SUBST(CP, ['cp'])
-if $as_mkdir_p; then
-  AC_SUBST(MAKEDIRS, ['mkdir -p'])
-else
-  AC_SUBST(MAKEDIRS, ['install -d'])
-fi
-
 dnl check for large file stuff
 AC_SYS_LARGEFILE
 
@@ -244,11 +208,6 @@ AC_CHECK_SIZEOF(float, 4)
 AC_CHECK_SIZEOF(double, 8)
 AC_CHECK_SIZEOF(time_t, 0)
 
-for id in pid_t gid_t uid_t; do
-    AC_CHECK_TYPE($id, [typ=$id], [typ=int])
-    AC_DEFINE_UNQUOTED(rb_$id, $typ)
-done
-
 AC_CACHE_CHECK(for prototypes, rb_cv_have_prototypes,
   [AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],
 	rb_cv_have_prototypes=yes,
@@ -287,7 +246,7 @@ if test "$rb_cv_stdarg" = yes; then
 fi
 
 AC_CACHE_CHECK([for noreturn], rb_cv_noreturn,
-[rb_cv_noreturn=x
+[rb_cv_noreturn=no
 for mac in "x __attribute__ ((noreturn))" "__declspec(noreturn) x" x; do
   AC_TRY_COMPILE(
     [#define NORETURN(x) $mac
@@ -297,17 +256,6 @@ NORETURN(void exit(int x));],
 done])
 AC_DEFINE_UNQUOTED([NORETURN(x)], $rb_cv_noreturn)
 
-AC_CACHE_CHECK([for RUBY_EXTERN], rb_cv_ruby_extern,
-[rb_cv_ruby_extern=no
-for mac in "__attribute__((dllimport))" "__declspec(dllimport)"; do
-  AC_TRY_COMPILE(
-    [extern $mac void conftest(void);],
-    [rb_cv_ruby_extern="extern $mac"; break])
-done])
-test "x$rb_cv_ruby_extern" = xno || AC_DEFINE_UNQUOTED(RUBY_EXTERN, $rb_cv_ruby_extern)
-
-XCFLAGS="$XCFLAGS -DRUBY_EXPORT"
-
 dnl Check whether we need to define sys_nerr locally
 AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
 #include <errno.h>])
@@ -335,17 +283,13 @@ hpux*)		LIBS="-lm $LIBS"
 human*)		ac_cv_func_getpgrp_void=yes
 		ac_cv_func_setitimer=no
 		;;
-beos*)		ac_cv_func_link=no;;
+beos*)		;;
 cygwin*)	rb_cv_have_daylight=no
 		ac_cv_var_tzname=no
 		ac_cv_func__setjmp=no
 		ac_cv_func_setitimer=no
 		;;
-mingw*)		if test "$with_winsock2" = yes; then
-		  LIBS="-lws2_32 $LIBS"
-		else
-		  LIBS="-lwsock32 $LIBS"
-		fi
+mingw*)		LIBS="-lwsock32 $LIBS"
 		ac_cv_header_a_out_h=no
 		ac_cv_header_pwd_h=no
 		ac_cv_header_utime_h=no
@@ -353,7 +297,6 @@ mingw*)		if test "$with_winsock2" = yes; then
 		ac_cv_header_sys_param_h=no
 		ac_cv_header_sys_resource_h=no
 		ac_cv_header_sys_select_h=no
-		ac_cv_header_sys_time_h=no
 		ac_cv_header_sys_times_h=no
 		ac_cv_func_times=yes
 		ac_cv_func_waitpid=yes
@@ -364,14 +307,7 @@ mingw*)		if test "$with_winsock2" = yes; then
 		ac_cv_func_isinf=yes
 		ac_cv_func_isnan=yes
 		ac_cv_func_finite=yes
-		ac_cv_func_link=yes
 		ac_cv_lib_crypt_crypt=no
-		ac_cv_func_getpgrp_void=no
-		ac_cv_func_setpgrp_void=yes
-		ac_cv_func_memcmp_working=yes
-		ac_cv_lib_dl_dlopen=no
-		rb_cv_binary_elf=no
-		rb_cv_negative_time_t=no
 		enable_pthread=no
 		;;
 os2-emx*)	LIBS="-lm $LIBS"
@@ -379,10 +315,7 @@ os2-emx*)	LIBS="-lm $LIBS"
 msdosdjgpp*)	LIBS="-lm $LIBS"
 		ac_cv_func_getpgrp_void=yes
 		ac_cv_func_setitimer=no
-                ac_cv_sizeof_rlim_t=4
 		;;
-bsdi*)          LIBS="-lm $LIBS"
-                ac_cv_sizeof_rlim_t=8;;
 freebsd*)	LIBS="-lm $LIBS"
 		AC_CACHE_CHECK([whether -lxpg4 has to be linked],
 		  rb_cv_lib_xpg4_needed,
@@ -422,11 +355,6 @@ bow)		ac_cv_func_setitimer=no
 		;;
 superux*)     ac_cv_func_setitimer=no
               ;;
-solaris*2.10)  if test -z "$GCC"; then
-                      ac_cv_func_isinf=yes
-              fi
-               LIBS="-lm $LIBS"
-              ;;
 *) LIBS="-lm $LIBS";;
 esac
 AC_CHECK_LIB(crypt, crypt)
@@ -444,30 +372,14 @@ dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h sys/syscall.h\
+AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h\
 		 fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\
 		 syscall.h pwd.h grp.h a.out.h utime.h memory.h direct.h sys/resource.h \
 		 sys/mkdev.h sys/utime.h netinet/in_systm.h float.h ieeefp.h pthread.h \
 		 ucontext.h intrinsics.h)
 
-dnl Check additional types.
-AC_CHECK_SIZEOF(rlim_t, 0, [
-  #ifdef HAVE_SYS_TYPES_H
-  # include <sys/types.h>
-  #endif
-  #ifdef HAVE_SYS_TIME_H
-  # include <sys/time.h>
-  #endif
-  #ifdef HAVE_SYS_RESOURCE_H
-  # include <sys/resource.h>
-  #endif
-  #ifdef HAVE_UNISTD_H
-  # include <unistd.h>
-  #endif
-  #include <stdio.h>
-])
-
 dnl Checks for typedefs, structures, and compiler characteristics.
+AC_TYPE_UID_T
 AC_TYPE_SIZE_T
 AC_STRUCT_ST_BLKSIZE
 AC_STRUCT_ST_BLOCKS
@@ -480,18 +392,17 @@ AC_FUNC_ALLOCA
 AC_FUNC_MEMCMP
 AC_FUNC_FSEEKO
 AC_CHECK_FUNCS(ftello)
-AC_REPLACE_FUNCS(dup2 memmove strcasecmp strncasecmp strerror strftime\
+AC_REPLACE_FUNCS(dup2 memmove mkdir strcasecmp strncasecmp strerror strftime\
 		 strchr strstr strtoul crypt flock vsnprintf\
 		 isnan finite isinf hypot acosh erf)
-AC_CHECK_FUNCS(fmod killpg wait4 waitpid syscall chroot fsync getcwd eaccess\
-	      truncate chsize times utimes fcntl lockf lstat symlink link\
-	      readlink setitimer setruid seteuid setreuid setresuid\
-	      setproctitle setrgid setegid setregid setresgid issetugid pause\
-	      lchown lchmod getpgrp setpgrp getpgid setpgid initgroups\
-	      getgroups setgroups getpriority getrlimit setrlimit sysconf\
-              dlopen sigprocmask\
-	      sigaction _setjmp setsid telldir seekdir fchmod mktime timegm\
-	      cosh sinh tanh setuid setgid setenv unsetenv)
+AC_CHECK_FUNCS(fmod killpg wait4 waitpid syscall chroot fsync getcwd\
+	      truncate chsize times utimes fcntl lockf lstat symlink readlink\
+	      setitimer setruid seteuid setreuid setresuid setproctitle\
+	      setrgid setegid setregid setresgid issetugid pause lchown lchmod\
+	      getpgrp setpgrp getpgid setpgid initgroups getgroups setgroups\
+	      getpriority getrlimit dlopen sigprocmask sigaction _setjmp\
+	      setsid telldir seekdir fchmod mktime timegm cosh sinh tanh\
+	      setuid setgid)
 AC_ARG_ENABLE(setreuid,
        [  --enable-setreuid       use setreuid()/setregid() according to need even if obsolete.],
        [use_setreuid=$enableval])
@@ -679,7 +590,7 @@ else
   fi
 fi
 
-AC_DEFUN([RUBY_CHECK_IO_NEED],
+AC_DEFUN(RUBY_CHECK_IO_NEED,
 [AC_CACHE_CHECK(whether need to [$1], [$2],
     [AC_TRY_RUN([
 #include <stdio.h>
@@ -754,22 +665,6 @@ if test $rb_cv_huge_st_ino = yes; then
   AC_DEFINE(HUGE_ST_INO)
 fi
 
-if test "$ac_cv_func_sysconf" = yes; then
-  AC_DEFUN([RUBY_CHECK_SYSCONF], [dnl
-  AC_CACHE_CHECK([whether _SC_$1 is supported], rb_cv_have_sc_[]m4_tolower($1),
-    [AC_TRY_COMPILE([#include <unistd.h>
-      ],
-      [_SC_$1 >= 0],
-      rb_cv_have_sc_[]m4_tolower($1)=yes,
-      rb_cv_have_sc_[]m4_tolower($1)=no)
-    ])
-  if test "$rb_cv_have_sc_[]m4_tolower($1)" = yes; then
-    AC_DEFINE(HAVE__SC_$1)
-  fi
-  ])
-  RUBY_CHECK_SYSCONF(CLK_TCK)
-fi
-
 case "$target_cpu" in
 m68*|i?86|ia64|sparc*|alpha*) rb_cv_stack_grow_dir=-1;;
 hppa*) rb_cv_stack_grow_dir=+1;;
@@ -881,12 +776,20 @@ if test "$rb_cv_binary_elf" = yes; then
 fi
 
 case "$target_os" in
-linux* | gnu* | k*bsd*-gnu | bsdi*)
+linux* | gnu* | k*bsd*-gnu)
     if test "$rb_cv_binary_elf" = no; then
 	with_dln_a_out=yes
     else
 	LDFLAGS="$LDFLAGS -rdynamic"
     fi;;
+netbsd*|openbsd*)
+    if [[ "`$CC -dM -E - </dev/null | grep __ELF__`" != "" ]]
+    then
+	netbsd_elf=yes
+    else
+	netbsd_elf=no
+    fi
+    ;;
 esac
 LIBEXT=a
 
@@ -930,12 +833,12 @@ if test "$with_dln_a_out" != yes; then
 	hpux*)		DLDFLAGS="$DLDFLAGS -E"
 			: ${LDSHARED='ld -b'}
 			XLDFLAGS="$XLDFLAGS -Wl,-E"
-			: ${LIBPATHENV=SHLIB_PATH}
 			rb_cv_dlopen=yes;;
 	solaris*) 	if test "$GCC" = yes; then
-                          : ${LDSHARED='$(CC) -shared'}
+			   : ${LDSHARED='$(CC) -Wl,-G'}
 			   if test "$rb_cv_prog_gnu_ld" = yes; then
 	 		       LDFLAGS="$LDFLAGS -Wl,-E"
+			       LDSHARED="$LDSHARED -shared"
 			   fi
 			else
 			   : ${LDSHARED='ld -G'}
@@ -953,15 +856,8 @@ if test "$with_dln_a_out" != yes; then
 			rb_cv_dlopen=yes ;;
 	osf*) 		: ${LDSHARED="ld -shared -expect_unresolved \"*\""}
 			rb_cv_dlopen=yes ;;
-	bsdi3*) 	case "$CC" in
-			*shlicc*)	: ${LDSHARED="$CC -r"}
-					rb_cv_dlopen=yes ;;
-			esac ;;
-	linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi*)
-			: ${LDSHARED='${CC} -shared'}
-			if test "$rb_cv_binary_elf" = yes; then
-			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
-			fi
+	linux* | gnu* | k*bsd*-gnu)
+		 	: ${LDSHARED="$CC -shared"}
 			rb_cv_dlopen=yes ;;
 	interix*) 	: ${LDSHARED="$CC -shared"}
 			XLDFLAGS="$XLDFLAGS -Wl,-E"
@@ -975,11 +871,25 @@ if test "$with_dln_a_out" != yes; then
 			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
 			fi
 			rb_cv_dlopen=yes ;;
+	netbsd*)	: ${LDSHARED='${CC} -shared'}
+			if test "$rb_cv_binary_elf" = yes; then
+			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
+			    LIBPATHFLAG=" -L'%1\$-s'"
+			    RPATHFLAG=" -Wl,-R'%1\$-s'"
+			fi
+			rb_cv_dlopen=yes ;;
 	openbsd*) 	: ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
 			if test "$rb_cv_binary_elf" = yes; then
 			    LDFLAGS="$LDFLAGS -Wl,-E"
 			fi
 			rb_cv_dlopen=yes ;;
+	bsdi3*) 	case "$CC" in
+			*shlicc*)	: ${LDSHARED="$CC -r"}
+					rb_cv_dlopen=yes ;;
+			esac ;;
+	bsdi*)		: ${LDSHARED="ld -shared"}
+			LDFLAGS="$LDFLAGS "'-rdynamic -Wl,-rpath,$(libdir)/ruby/$(MAJOR).$(MINOR)/i386-bsdi4.0'
+			rb_cv_dlopen=yes ;;
 	nextstep*)	: ${LDSHARED='cc -r -nostdlib'}
 			LDFLAGS="$LDFLAGS -u libsys_s"
 			rb_cv_dlopen=yes ;;
@@ -991,22 +901,17 @@ if test "$with_dln_a_out" != yes; then
 			rb_cv_dlopen=yes ;;
 	darwin*)	: ${LDSHARED='cc -dynamic -bundle -undefined suppress -flat_namespace'}
 			: ${LDFLAGS=""}
-			: ${LIBPATHENV=DYLD_LIBRARY_PATH}
 			rb_cv_dlopen=yes ;;
-        aix*)           if test "$GCC" = yes; then
-                           : ${LDSHARED='gcc -shared'}
-                           DLDFLAGS='-Wl,-G -eInit_$(TARGET)'
-                           LDFLAGS='-Wl,-brtl -Wl,-bE:ruby.imp'
-                        else
-                          : ${LDSHARED='/usr/ccs/bin/ld'}
-                          DLDFLAGS='-G -eInit_$(TARGET)'
-                          LDFLAGS="-brtl -bE:ruby.imp"
-                        fi
-                        : ${ARCHFILE="ruby.imp"}
-                        TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
-                        TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
-                        : ${LIBPATHENV=SHLIB_PATH}
-                        rb_cv_dlopen=yes ;;
+	aix*)		: ${LDSHARED='/usr/ccs/bin/ld'}
+			XLDFLAGS="$XLDFLAGS -Wl,-bE:ruby.imp"
+			DLDFLAGS='-brtl -bI:$(topdir)/ruby.imp -bM:SRE -T512 -H512 '"$DLDFLAGS"
+			ARCH_FLAGS='-eInit_$(TARGET)'
+			: LDFLAGS="-brtl $LDFLAGS"
+			: ${ARCHFILE="ruby.imp"}
+			TRY_LINK='$(CC) $(DLDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS) $(CFLAGS)'
+			TRY_LINK="$TRY_LINK"' $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
+			rb_cv_dlopen=yes ;;
+
 	human*)		: ${DLDFLAGS=''}
 			: ${LDSHARED=''}
 			: ${LDFLAGS=''}
@@ -1022,7 +927,6 @@ if test "$with_dln_a_out" != yes; then
 			    DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot"
 			    ;;
 			esac
-			: ${LIBPATHENV=LIBRARY_PATH}
 			rb_cv_dlopen=yes ;;
 	nto-qnx*)	DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
 			: ${LDSHARED='ld -Bshareable -x'}
@@ -1031,7 +935,6 @@ if test "$with_dln_a_out" != yes; then
 	cygwin*|mingw*)	: ${LDSHARED="${CC} -shared -s"}
 			XLDFLAGS="$XLDFLAGS -Wl,--stack,0x02000000"
 			DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-import,--export-all"
-			: ${LIBPATHENV=""}
 			rb_cv_dlopen=yes ;;
 	hiuxmpp)	: ${LDSHARED='ld -r'} ;;
 	atheos*) 	: ${LDSHARED="$CC -shared"}
@@ -1041,23 +944,10 @@ if test "$with_dln_a_out" != yes; then
 	*) 		: ${LDSHARED='ld'} ;;
   esac
   AC_MSG_RESULT($rb_cv_dlopen)
-
-  AC_ARG_ENABLE(rpath,
-       [  --disable-rpath         embed run path into extension libraries.],
-       [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
-  if test "$enable_rpath" = yes; then
-    LIBPATHFLAG=" -L'%1\$-s'"
-    if test "$GCC" = yes; then
-       RPATHFLAG=" -Wl,-R'%1\$-s'"
-    else
-       RPATHFLAG=" -R'%1\$-s'"
-    fi
-  fi
 fi
 AC_SUBST(LINK_SO)
 AC_SUBST(LIBPATHFLAG)
 AC_SUBST(RPATHFLAG)
-AC_SUBST(LIBPATHENV, "${LIBPATHENV-LD_LIBRARY_PATH}")
 AC_SUBST(TRY_LINK)
 
 dln_a_out_works=no
@@ -1216,16 +1106,12 @@ fi
 if test x"$cross_compiling" = xyes; then
   test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` -rfake"
   PREP=fake.rb
-  RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
 else
   MINIRUBY='./miniruby$(EXEEXT)'
-  PREP='miniruby$(EXEEXT)'
-  RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT) --'
+  PREP=''
 fi
 AC_SUBST(MINIRUBY)
 AC_SUBST(PREP)
-AC_SUBST(RUNRUBY)
-AC_SUBST(EXTOUT, [${EXTOUT-.ext}])
 
 FIRSTMAKEFILE=""
 LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'
@@ -1266,7 +1152,7 @@ if test "$enable_shared" = 'yes'; then
     sunos4*)
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
 	;;
-    linux* | gnu* | k*bsd*-gnu | atheos*)
+    linux* | gnu* | k*bsd*-gnu)
 	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
 	;;
@@ -1282,6 +1168,7 @@ if test "$enable_shared" = 'yes'; then
 	SOLIBS='$(LIBS)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
 	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
+	LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
 	if test "$rb_cv_binary_elf" = yes; then # ELF platforms
 	   LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
 	else	# a.out platforms
@@ -1293,12 +1180,6 @@ if test "$enable_shared" = 'yes'; then
 	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
 	;;
     solaris*)
-	SOLIBS='$(LIBS)'
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)'
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so'
-	if test "$GCC" = yes; then
-	    LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)'
-	fi
 	XLDFLAGS="$XLDFLAGS "'-R${libdir}'
  	;;
     hpux*)
@@ -1309,12 +1190,12 @@ if test "$enable_shared" = 'yes'; then
     aix*)
 	if test "$GCC" = yes; then
 	    LIBRUBY_LDSHARED='$(CC) -shared'
-	    LIBRUBY_DLDFLAGS='-Wl,-G -Wl,-bE:ruby.imp -Wl,-bnoentry'
+	    LIBRUBY_DLDFLAGS='-Wl,-bE:ruby.imp'
 	else
 	    LIBRUBY_LDSHARED='/usr/ccs/bin/ld'
-	    LIBRUBY_DLDFLAGS='-G -bE:ruby.imp -bnoentry'
+	    LIBRUBY_DLDFLAGS='-bE:ruby.imp -bM:SRE -bnoentry'
 	fi
-	LIBRUBYARG_SHARED='-L${libdir} -lruby'
+	LIBRUBYARG_SHARED='-L${libdir} -Wl,lib$(RUBY_SO_NAME).so'
 	SOLIBS='-lm -lc'
 	;;
     beos*)
@@ -1330,6 +1211,10 @@ if test "$enable_shared" = 'yes'; then
 	LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
 	;;
+    atheos*)
+	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
+	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
+	;;
     interix*)
 	LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)'
 	;;
@@ -1337,14 +1222,6 @@ if test "$enable_shared" = 'yes'; then
 	;;
   esac
 fi
-if test "$enable_rpath" = yes; then
-    if test "$GCC" = yes; then
-       LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
-    else
-       LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
-    fi
-fi
-
 XLDFLAGS="$XLDFLAGS -L."
 AC_SUBST(ARCHFILE)
 
@@ -1418,17 +1295,18 @@ case "$target_os" in
 	    AC_LIBOBJ([strftime])
 	    ;;
 	mingw*)
-	    RUBY_SO_NAME=${rb_cv_msvcrt}-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR}
+	    RUBY_SO_NAME=msvcrt-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR}
 	    if test x"$enable_shared" = xyes; then
 		LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
 		LIBRUBY='lib$(LIBRUBY_SO).a'
 	    fi
 	    AC_LIBOBJ([win32])
 	    COMMON_LIBS=m
-#	    COMMON_MACROS="WIN32_LEAN_AND_MEAN="
+	    COMMON_MACROS="WIN32_LEAN_AND_MEAN="
 	    COMMON_HEADERS="windows.h winsock.h"
 	    ;;
 	esac
+	XCFLAGS="$XCFLAGS"
 	LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
 	LIBRUBY_ALIASES=''
 	FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
@@ -1438,7 +1316,6 @@ case "$target_os" in
 	    LIBRUBY='lib$(RUBY_SO_NAME).a'
 	    LIBRUBYARG='-l$(RUBY_SO_NAME)'
 	fi
-	MINIOBJS=dmydln.o
 	;;
     hpux*)
 	case "$YACC" in
@@ -1447,10 +1324,6 @@ case "$target_os" in
 	    YACC="$YACC -Nl40000 -Nm40000"
 	    ;;
 	esac
-	MINIOBJS=dmydln.o
-	;;
-    aix*)
-	PREINSTALL='@$(RM) -r $(prefix)/lib/$(LIBRUBY_A) $(prefix)/lib/$(LIBRUBY_SO) $(prefix)/lib/ruby/$(MAJOR).$(MINOR)/$(arch)'
 	;;
     *)
 	;;
@@ -1483,8 +1356,6 @@ AC_SUBST(COMMON_LIBS)
 AC_SUBST(COMMON_MACROS)
 AC_SUBST(COMMON_HEADERS)
 AC_SUBST(EXPORT_PREFIX)
-AC_SUBST(MINIOBJS)
-AC_SUBST(PREINSTALL)
 
 MAKEFILES="Makefile `echo $FIRSTMAKEFILE | sed 's/:.*//'`"
 MAKEFILES="`echo $MAKEFILES`"
@@ -1519,7 +1390,7 @@ AC_ARG_WITH(sitedir,
 	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
             [sitedir=$withval],
             [sitedir='${prefix}/lib/ruby/site_ruby'])
-SITE_DIR=`eval echo \\"${sitedir}\\"`
+SITE_DIR="`eval \"echo ${sitedir}\"`"
 case "$target_os" in
   cygwin*|mingw*|*djgpp*|os2-emx*)
     RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
@@ -1555,7 +1426,7 @@ else
 fi
 
 case "$target_os" in
-  mingw*) sitearch="i386-$rb_cv_msvcrt" ;;
+  mingw*) sitearch="i386-msvcrt" ;;
   *) sitearch="${arch}" ;;
 esac
 
@@ -1599,10 +1470,5 @@ else
 fi
 : > confdefs.h
 
-AC_CONFIG_FILES($FIRSTMAKEFILE)
-AC_CONFIG_FILES(Makefile, [{
-	echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
-	test "$RUBY_INSTALL_NAME$EXEEXT" = ruby || echo 'ruby: $(PROGRAM);'
-	sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
-} >> Makefile], [RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT])
+AC_CONFIG_FILES([$FIRSTMAKEFILE Makefile])
 AC_OUTPUT
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 03208df11c..da9efaab47 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -1,14 +1,11 @@
 include Makefile
 
 ENABLE_SHARED=@ENABLE_SHARED@
-DLLWRAP = @DLLWRAP@ --target=@target_os@
 
 ifeq (@target_os@,cygwin)
   DLL_BASE_NAME := $(subst .dll,,$(LIBRUBY_SO))
 else
   DLL_BASE_NAME := $(RUBY_SO_NAME)
-  DLLWRAP += -mno-cygwin
-  VPATH += $(srcdir)/win32
 endif
 
 ifneq ($(ENABLE_SHARED),yes)
@@ -27,10 +24,6 @@ endif
 WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
 SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
 EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@)
-RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc
-
-ruby: $(PROGRAM)
-rubyw: $(WPROGRAM)
 
 $(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO)
 $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
@@ -38,7 +31,7 @@ $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
 %.res.@OBJEXT@: %.rc
 	@WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
 
-$(RCFILES): $(RBCONFIG)
+$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc: rbconfig.rb
 	@$(MINIRUBY) $(srcdir)/win32/resource.rb \
 	  -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
 	  -so_name=$(DLL_BASE_NAME) \
@@ -51,7 +44,7 @@ $(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@
 	  $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
 
 $(RUBY_EXP): $(LIBRUBY_A)
-	$(DLLWRAP) \
+	@DLLWRAP@ --target=@target_os@ --driver-name=$(CC) \
 	  --output-exp=$(RUBY_EXP) \
 	  --export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)
 	$(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)
@@ -70,9 +63,3 @@ cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR).dll: $(LIBRUBY_A)
 	@DLLWRAP@ -s --def=rubydll.def -o $@
 	@rm -f rubydll.def
 endif
-
-clean-local::
-	@$(RM) $(RUBY_EXP) $(RCFILES:.rc=.res.@OBJEXT@)
-
-distclean-local::
-	@$(RM) $(RCFILES)
diff --git a/defines.h b/defines.h
index 89167e537e..77f3f40a55 100644
--- a/defines.h
+++ b/defines.h
@@ -2,8 +2,8 @@
 
   defines.h -
 
-  $Author: nobu $
-  $Date: 2005/10/25 16:59:57 $
+  $Author$
+  $Date$
   created at: Wed May 18 00:21:44 JST 1994
 
 ************************************************/
@@ -176,6 +176,7 @@ void xfree _((void*));
 #ifndef X_OK
 #define X_OK 1
 #endif
+typedef int pid_t;
 #endif /* __APPLE__ */
 #endif /* NeXT */
 
@@ -184,15 +185,18 @@ void xfree _((void*));
 #endif
 
 #if defined(__VMS)
-#include "vms.h"
+#include "vms/vms.h"
 #endif
 
 #if defined(__BEOS__)
 #include <net/socket.h> /* intern.h needs fd_set definition */
 #endif
 
-#ifdef RUBY_EXPORT
 #undef RUBY_EXTERN
+#if defined _WIN32 && !defined __GNUC__
+# ifndef RUBY_EXPORT
+#  define RUBY_EXTERN extern __declspec(dllimport)
+# endif
 #endif
 
 #ifndef RUBY_EXTERN
@@ -221,13 +225,6 @@ flush_register_windows(void)
 	;
 }
 #  define FLUSH_REGISTER_WINDOWS flush_register_windows()
-#elif defined(__ia64__)
-void flush_register_windows(void)
-#  if defined(__GNUC__) && (( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3)
-__attribute__ ((noinline))
-#  endif
-  ;
-#  define FLUSH_REGISTER_WINDOWS flush_register_windows()
 #else
 #  define FLUSH_REGISTER_WINDOWS ((void)0)
 #endif
diff --git a/dir.c b/dir.c
index 0798b3f76f..2de990ad8a 100644
--- a/dir.c
+++ b/dir.c
@@ -2,8 +2,8 @@
 
   dir.c -
 
-  $Author: shyouhei $
-  $Date: 2006/12/14 14:50:13 $
+  $Author$
+  $Date$
   created at: Wed Jan  5 09:51:01 JST 1994
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -63,27 +63,14 @@ char *strchr _((char*,char));
 
 #include "util.h"
 
-#if !defined HAVE_LSTAT && !defined lstat
-#define lstat stat
-#endif
-
-#ifndef CASEFOLD_FILESYSTEM
-# if defined DOSISH || defined __VMS
-#   define CASEFOLD_FILESYSTEM 1
-# else
-#   define CASEFOLD_FILESYSTEM 0
-# endif
+#ifndef HAVE_LSTAT
+#define lstat(path,st) stat(path,st)
 #endif
 
 #define FNM_NOESCAPE	0x01
 #define FNM_PATHNAME	0x02
 #define FNM_DOTMATCH	0x04
 #define FNM_CASEFOLD	0x08
-#if CASEFOLD_FILESYSTEM
-#define FNM_SYSCASE	FNM_CASEFOLD
-#else
-#define FNM_SYSCASE	0
-#endif
 
 #define FNM_NOMATCH	1
 #define FNM_ERROR	2
@@ -158,7 +145,7 @@ fnmatch(pat, string, flags)
     int period = !(flags & FNM_DOTMATCH);
     int nocase = flags & FNM_CASEFOLD;
 
-    while ((c = *pat++) != '\0') {
+    while (c = *pat++) {
 	switch (c) {
 	case '?':
 	    if (!*s || ISDIRSEP(*s) || PERIOD(s))
@@ -316,7 +303,6 @@ dir_initialize(dir, dirname)
  *  the block, and <code>Dir::open</code> returns the value of the
  *  block.
  */
-
 static VALUE
 dir_s_open(klass, dirname)
     VALUE klass, dirname;
@@ -338,17 +324,7 @@ dir_closed()
     rb_raise(rb_eIOError, "closed directory");
 }
 
-static void
-dir_check(dir)
-    VALUE dir;
-{
-    if (!OBJ_TAINTED(dir) && rb_safe_level() >= 4)
-	rb_raise(rb_eSecurityError, "Insecure: operation on untainted Dir");
-    rb_check_frozen(dir);
-}
-
 #define GetDIR(obj, dirp) do {\
-    dir_check(dir);\
     Data_Get_Struct(obj, struct dir_data, dirp);\
     if (dirp->dir == NULL) dir_closed();\
 } while (0)
@@ -432,7 +408,6 @@ dir_each(dir)
     struct dirent *dp;
 
     GetDIR(dir, dirp);
-    rewinddir(dirp->dir);
     for (dp = readdir(dirp->dir); dp != NULL; dp = readdir(dirp->dir)) {
 	rb_yield(rb_tainted_str_new(dp->d_name, NAMLEN(dp)));
 	if (dirp->dir == NULL) dir_closed();
@@ -488,11 +463,10 @@ dir_seek(dir, pos)
     VALUE dir, pos;
 {
     struct dir_data *dirp;
-    off_t p = NUM2OFFT(pos);
 
-    GetDIR(dir, dirp);
 #ifdef HAVE_SEEKDIR
-    seekdir(dirp->dir, p);
+    GetDIR(dir, dirp);
+    seekdir(dirp->dir, NUM2INT(pos));
     return dir;
 #else
     rb_notimplement();
@@ -559,9 +533,6 @@ dir_close(dir)
 {
     struct dir_data *dirp;
 
-    if (rb_safe_level() >= 4 && !OBJ_TAINTED(dir)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't close");
-    }
     GetDIR(dir, dirp);
     closedir(dirp->dir);
     dirp->dir = NULL;
@@ -786,8 +757,13 @@ dir_s_mkdir(argc, argv, obj)
     }
 
     check_dirname(&path);
+#ifndef _WIN32
     if (mkdir(RSTRING(path)->ptr, mode) == -1)
 	rb_sys_fail(RSTRING(path)->ptr);
+#else
+    if (mkdir(RSTRING(path)->ptr) == -1)
+	rb_sys_fail(RSTRING(path)->ptr);
+#endif
 
     return INT2FIX(0);
 }
@@ -812,22 +788,6 @@ dir_s_rmdir(obj, dir)
     return INT2FIX(0);
 }
 
-static void
-sys_warning_1(mesg)
-    const char* mesg;
-{
-    rb_sys_warning("%s", mesg);
-}
-
-#define GLOB_VERBOSE	(1U << (sizeof(int) * CHAR_BIT - 1))
-#define sys_warning(val) \
-    (void)((flags & GLOB_VERBOSE) && rb_protect((VALUE (*)_((VALUE)))sys_warning_1, (VALUE)(val), 0))
-
-#define GLOB_ALLOC(type) (type *)malloc(sizeof(type))
-#define GLOB_ALLOC_N(type, n) (type *)malloc(sizeof(type) * (n))
-#define GLOB_REALLOC_N(var, type, n) (type *)realloc((var), sizeof(type) * (n))
-#define GLOB_JUMP_TAG(status) ((status == -1) ? rb_memerror() : rb_jump_tag(status))
-
 /* Return nonzero if S has any special globbing chars in it.  */
 static int
 has_magic(s, send, flags)
@@ -837,8 +797,7 @@ has_magic(s, send, flags)
     register const char *p = s;
     register char c;
     int open = 0;
-    const int escape = !(flags & FNM_NOESCAPE);
-    const int nocase = flags & FNM_CASEFOLD;
+    int escape = !(flags & FNM_NOESCAPE);
 
     while ((c = *p++) != '\0') {
 	switch (c) {
@@ -857,11 +816,6 @@ has_magic(s, send, flags)
 	  case '\\':
 	    if (escape && *p++ == '\0')
 		return Qfalse;
-	    break;
-
-	  default:
-	    if (!FNM_SYSCASE && ISALPHA(c) && nocase)
-		return Qtrue;
 	}
 
 	if (send && p >= send) break;
@@ -877,8 +831,7 @@ extract_path(p, pend)
     int len;
 
     len = pend - p;
-    alloc = GLOB_ALLOC_N(char, len+1);
-    if (!alloc) return NULL;
+    alloc = ALLOC_N(char, len+1);
     memcpy(alloc, p, len);
     if (len > 1 && pend[-1] == '/'
 #if defined DOSISH_DRIVE_LETTER
@@ -939,65 +892,63 @@ glob_func_caller(val)
     VALUE val;
 {
     struct glob_args *args = (struct glob_args *)val;
-
     (*args->func)(args->c, args->v);
     return Qnil;
 }
 
-#define glob_call_func(func, path, arg) (*func)(path, arg)
+static int
+glob_call_func(func, path, arg)
+    void (*func) _((const char*, VALUE));
+    const char *path;
+    VALUE arg;
+{
+    int status;
+    struct glob_args args;
+
+    args.func = func;
+    args.c = path;
+    args.v = arg;
 
-static int glob_helper _((const char *path, const char *sub, int flags, int (*func)(const char *,VALUE), VALUE arg));
+    rb_protect(glob_func_caller, (VALUE)&args, &status);
+    return status;
+}
 
 static int
 glob_helper(path, sub, flags, func, arg)
-    const char *path;
-    const char *sub;
+    char *path;
+    char *sub;
     int flags;
-    int (*func) _((const char *, VALUE));
+    void (*func) _((const char*, VALUE));
     VALUE arg;
 {
     struct stat st;
-    const char *p, *m;
+    char *p, *m;
     int status = 0;
-    char *buf = 0;
-    char *newpath = 0;
-    char *newbuf;
 
     p = sub ? sub : path;
     if (!has_magic(p, 0, flags)) {
-#if !defined DOSISH
-	if (!(flags & FNM_NOESCAPE))
+#if defined DOSISH
+	remove_backslashes(path);
+#else
+	if (!(flags & FNM_NOESCAPE)) remove_backslashes(p);
 #endif
-	{
-	    newpath = strdup(path);
-	    if (!newpath) return -1;
-	    if (sub) {
-		p = newpath + (sub - path);
-		remove_backslashes(newpath + (sub - path));
-		sub = p;
-	    }
-	    else {
-		remove_backslashes(newpath);
-		p = path = newpath;
-	    }
-	}
 	if (lstat(path, &st) == 0) {
 	    status = glob_call_func(func, path, arg);
+	    if (status) return status;
 	}
 	else if (errno != ENOENT) {
 	    /* In case stat error is other than ENOENT and
 	       we may want to know what is wrong. */
-	    sys_warning(path);
+	    rb_sys_warning(path);
 	}
-	if (newpath) free(newpath);
-	return status;
+	return 0;
     }
 
     while (p && !status) {
 	if (*p == '/') p++;
 	m = strchr(p, '/');
 	if (has_magic(p, m, flags)) {
-	    char *dir, *base, *magic;
+	    char *dir, *base, *magic, *buf;
 	    DIR *dirp;
 	    struct dirent *dp;
 	    int recursive = 0;
@@ -1008,21 +959,12 @@ glob_helper(path, sub, flags, func, arg)
 	    } *tmp, *link, **tail = &link;
 
 	    base = extract_path(path, p);
-	    if (!base) {
-		status = -1;
-		break;
-	    }
 	    if (path == p) dir = ".";
 	    else dir = base;
 
 	    magic = extract_elem(p);
-	    if (!magic) {
-		status = -1;
-		break;
-	    }
 	    if (stat(dir, &st) < 0) {
-	        if (errno != ENOENT)
-		    sys_warning(dir);
+	        if (errno != ENOENT) rb_sys_warning(dir);
 	        free(base);
 	        free(magic);
 	        break;
@@ -1031,19 +973,15 @@ glob_helper(path, sub, flags, func, arg)
 		if (m && strcmp(magic, "**") == 0) {
 		    int n = strlen(base);
 		    recursive = 1;
-		    newbuf = GLOB_REALLOC_N(buf, char, n+strlen(m)+3);
-		    if (!newbuf) {
-			status = -1;
-			goto finalize;
-		    }
-		    buf = newbuf;
+		    buf = ALLOC_N(char, n+strlen(m)+3);
 		    sprintf(buf, "%s%s", base, *base ? m : m+1);
 		    status = glob_helper(buf, buf+n, flags, func, arg);
+		    free(buf);
 		    if (status) goto finalize;
 		}
 		dirp = opendir(dir);
 		if (dirp == NULL) {
-		    sys_warning(dir);
+		    rb_sys_warning(dir);
 		    free(base);
 		    free(magic);
 		    break;
@@ -1067,16 +1005,11 @@ glob_helper(path, sub, flags, func, arg)
 			continue;
 		    if (fnmatch("*", dp->d_name, flags) != 0)
 			continue;
-		    newbuf = GLOB_REALLOC_N(buf, char, strlen(base)+NAMLEN(dp)+strlen(m)+6);
-		    if (!newbuf) {
-			status = -1;
-			break;
-		    }
-		    buf = newbuf;
+		    buf = ALLOC_N(char, strlen(base)+NAMLEN(dp)+strlen(m)+6);
 		    sprintf(buf, "%s%s%s", base, (BASE) ? "/" : "", dp->d_name);
 		    if (lstat(buf, &st) < 0) {
-			if (errno != ENOENT)
-			    sys_warning(buf);
+			if (errno != ENOENT) rb_sys_warning(buf);
+			free(buf);
 			continue;
 		    }
 		    if (S_ISDIR(st.st_mode)) {
@@ -1084,31 +1017,24 @@ glob_helper(path, sub, flags, func, arg)
 		        strcpy(t, "/**");
 			strcpy(t+3, m);
 			status = glob_helper(buf, t, flags, func, arg);
+			free(buf);
 			if (status) break;
 			continue;
 		    }
+		    free(buf);
 		    continue;
 		}
 		if (fnmatch(magic, dp->d_name, flags) == 0) {
-		    newbuf = GLOB_REALLOC_N(buf, char, strlen(base)+NAMLEN(dp)+2);
-		    if (!newbuf) {
-			status = -1;
-			break;
-		    }
-		    buf = newbuf;
+		    buf = ALLOC_N(char, strlen(base)+NAMLEN(dp)+2);
 		    sprintf(buf, "%s%s%s", base, (BASE) ? "/" : "", dp->d_name);
 		    if (!m) {
 			status = glob_call_func(func, buf, arg);
+			free(buf);
 			if (status) break;
 			continue;
 		    }
-		    tmp = GLOB_ALLOC(struct d_link);
-		    if (!tmp) {
-			status = -1;
-			break;
-		    }
+		    tmp = ALLOC(struct d_link);
 		    tmp->path = buf;
-		    buf = 0;
 		    *tail = tmp;
 		    tail = &tmp->next;
 		}
@@ -1125,22 +1051,17 @@ glob_helper(path, sub, flags, func, arg)
 			    if (S_ISDIR(st.st_mode)) {
 				int len = strlen(link->path);
 				int mlen = strlen(m);
+				char *t = ALLOC_N(char, len+mlen+1);
 
-				newbuf = GLOB_REALLOC_N(buf, char, len+mlen+1);
-				if (!newbuf) {
-				    status = -1;
-				    goto next_elem;
-				}
-				buf = newbuf;
-				sprintf(buf, "%s%s", link->path, m);
-				status = glob_helper(buf, buf+len, flags, func, arg);
+				sprintf(t, "%s%s", link->path, m);
+				status = glob_helper(t, t+len, flags, func, arg);
+				free(t);
 			    }
 			}
 			else {
-			    sys_warning(link->path);
+			    rb_sys_warning(link->path);
 			}
 		    }
-		  next_elem:
 		    tmp = link;
 		    link = link->next;
 		    free(tmp->path);
@@ -1151,44 +1072,6 @@ glob_helper(path, sub, flags, func, arg)
 	}
 	p = m;
     }
-    if (buf) free(buf);
-    if (newpath) free(newpath);
-    return status;
-}
-
-int
-ruby_glob(path, flags, func, arg)
-    const char *path;
-    int flags;
-    int (*func) _((const char *, VALUE));
-    VALUE arg;
-{
-    flags |= FNM_SYSCASE;
-    return glob_helper(path, 0, flags & ~GLOB_VERBOSE, func, arg);
-}
-
-int
-ruby_globi(path, flags, func, arg)
-    const char *path;
-    int flags;
-    int (*func) _((const char *, VALUE));
-    VALUE arg;
-{
-    return glob_helper(path, 0, flags | FNM_CASEFOLD, func, arg);
-}
-
-static int rb_glob_caller _((const char *, VALUE));
-
-static int
-rb_glob_caller(path, a)
-    const char *path;
-    VALUE a;
-{
-    int status;
-    struct glob_args *args = (struct glob_args *)a;
-
-    args->c = path;
-    rb_protect(glob_func_caller, a, &status);
     return status;
 }
 
@@ -1196,16 +1079,17 @@ static int
 rb_glob2(path, flags, func, arg)
     const char *path;
     int flags;
-    void (*func) _((const char *, VALUE));
+    void (*func) _((const char*, VALUE));
     VALUE arg;
 {
-    struct glob_args args;
-
-    args.func = func;
-    args.v = arg;
+    char *buf;
+    int status;
 
-    flags |= FNM_SYSCASE;
-    return glob_helper(path, 0, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args);
+    buf = ALLOC_N(char, strlen(path)+1);
+    strcpy(buf, path);
+    status = glob_helper(buf, 0, flags, func, arg);
+    free(buf);
+    return status;
 }
 
 void
@@ -1215,6 +1099,7 @@ rb_glob(path, func, arg)
     VALUE arg;
 {
     int status = rb_glob2(path, 0, func, arg);
+
     if (status) rb_jump_tag(status);
 }
 
@@ -1225,6 +1110,7 @@ rb_globi(path, func, arg)
     VALUE arg;
 {
     int status = rb_glob2(path, FNM_CASEFOLD, func, arg);
+
     if (status) rb_jump_tag(status);
 }
 
@@ -1246,19 +1132,18 @@ push_globs(ary, s, flags)
 }
 
 static int
-push_braces(ary, str, flags)
+push_braces(ary, s, flags)
     VALUE ary;
-    const char *str;
+    const char *s;
     int flags;
 {
-    char *buf = 0;
-    char *b, *newbuf;
-    const char *s, *p, *t;
+    char *buf, *b;
+    const char *p, *t;
     const char *lbrace, *rbrace;
     int nest = 0;
     int status = 0;
 
-    s = p = str;
+    p = s;
     lbrace = rbrace = 0;
     while (*p) {
 	if (*p == '{') {
@@ -1278,36 +1163,26 @@ push_braces(ary, str, flags)
 
     if (lbrace && rbrace) {
 	int len = strlen(s);
+	buf = xmalloc(len + 1);
+	memcpy(buf, s, lbrace-s);
+	b = buf + (lbrace-s);
 	p = lbrace;
 	while (*p != '}') {
 	    t = p + 1;
 	    for (p = t; *p!='}' && *p!=','; p++) {
 		/* skip inner braces */
-		if (*p == '{') {
-		    nest = 1;
-		    while (*++p != '}' || --nest) {
-			if (*p == '{') nest++;
-		    }
-		}
+		if (*p == '{') while (*p!='}') p++;
 	    }
-	    newbuf = GLOB_REALLOC_N(buf, char, len+1);
-	    if (!newbuf) {
-		status = -1;
-		break;
-	    }
-	    buf = newbuf;
-	    memcpy(buf, s, lbrace-s);
-	    b = buf + (lbrace-s);
 	    memcpy(b, t, p-t);
 	    strcpy(b+(p-t), rbrace+1);
 	    status = push_braces(ary, buf, flags);
 	    if (status) break;
 	}
+	free(buf);
     }
     else {
-	status = push_globs(ary, str, flags);
+	status = push_globs(ary, s, flags);
     }
-    if (buf) free(buf);
 
     return status;
 }
@@ -1319,7 +1194,9 @@ rb_push_glob(str, flags)
     VALUE str;
     int flags;
 {
-    const char *p, *pend, *buf;
+    const char *p, *pend;
+    char *buf;
+    char *t;
     int nest, maxnest;
     int status = 0;
     int noescape = flags & FNM_NOESCAPE;
@@ -1327,21 +1204,25 @@ rb_push_glob(str, flags)
 
     ary = rb_ary_new();
     SafeStringValue(str);
+    buf = xmalloc(RSTRING(str)->len + 1);
+
     p = RSTRING(str)->ptr;
     pend = p + RSTRING(str)->len;
 
     while (p < pend) {
+	t = buf;
 	nest = maxnest = 0;
 	while (p < pend && isdelim(*p)) p++;
-	buf = p;
 	while (p < pend && !isdelim(*p)) {
 	    if (*p == '{') nest++, maxnest++;
 	    if (*p == '}') nest--;
 	    if (!noescape && *p == '\\') {
-		if (++p == pend) break;
+		*t++ = *p++;
+		if (p == pend) break;
 	    }
-	    p++;
+	    *t++ = *p++;
 	}
+	*t = '\0';
 	if (maxnest == 0) {
 	    status = push_globs(ary, buf, flags);
 	    if (status) break;
@@ -1352,7 +1233,10 @@ rb_push_glob(str, flags)
 	}
 	/* else unmatched braces */
     }
-    if (status) GLOB_JUMP_TAG(status);
+    free(buf);
+
+    if (status) rb_jump_tag(status);
+
     if (rb_block_given_p()) {
 	rb_ary_each(ary);
 	return Qnil;
@@ -1378,38 +1262,14 @@ dir_s_aref(obj, str)
 /*
  *  call-seq:
  *     Dir.glob( string, [flags] ) => array
- *     Dir.glob( string, [flags] ) {| filename | block }  => nil
+ *     Dir.glob( string, [flags] ) {| filename | block }  => false
  *
  *  Returns the filenames found by expanding the pattern given in
  *  <i>string</i>, either as an <i>array</i> or as parameters to the
  *  block. Note that this pattern is not a regexp (it's closer to a
- *  shell glob). See <code>File::fnmatch</code> for the meaning of
- *  the <i>flags</i> parameter.
- *
- *  <code>*</code>::        Matches any file. Can be restricted by
- *                          other values in the glob. <code>*</code>
- *                          will match all files; <code>c*</code> will
- *                          match all files beginning with
- *                          <code>c</code>; <code>*c</code> will match
- *                          all files ending with <code>c</code>; and
- *                          <code>*c*</code> will match all files that
- *                          have <code>c</code> in them (including at
- *                          the beginning or end). Equivalent to
- *                          <code>/ .* /x</code> in regexp.
- *  <code>**</code>::       Matches directories recursively.
- *  <code>?</code>::        Matches any one character. Equivalent to
- *                          <code>/.{1}/</code> in regexp.
- *  <code>[set]</code>::    Matches any one character in +set+.
- *                          Behaves exactly like character sets in
- *                          Regexp, including set negation
- *                          (<code>[^a-z]</code>).
- *  <code>{p,q}</code>::    Matches either literal <code>p</code> or
- *                          literal <code>q</code>. Matching literals
- *                          may be more than one character in length.
- *                          More than two literals may be specified.
- *                          Equivalent to pattern alternation in
- *                          regexp.
- *  <code>\</code>::        Escapes the next metacharacter.
+ *  shell glob). See <code>File::fnmatch</code> for
+ *  details of file name matching and the meaning of the <i>flags</i>
+ *  parameter.
  *
  *     Dir["config.?"]                     #=> ["config.h"]
  *     Dir.glob("config.?")                #=> ["config.h"]
@@ -1419,19 +1279,6 @@ dir_s_aref(obj, str)
  *     Dir.glob("*")                       #=> ["config.h", "main.rb"]
  *     Dir.glob("*", File::FNM_DOTMATCH)   #=> [".", "..", "config.h", "main.rb"]
  *
- *     rbfiles = File.join("**", "*.rb")
- *     Dir.glob(rbfiles)                   #=> ["main.rb",
- *                                              "lib/song.rb",
- *                                              "lib/song/karaoke.rb"]
- *     libdirs = File.join("**", "lib")
- *     Dir.glob(libdirs)                   #=> ["lib"]
- *
- *     librbfiles = File.join("**", "lib", "**", "*.rb")
- *     Dir.glob(librbfiles)                #=> ["lib/song.rb",
- *                                              "lib/song/karaoke.rb"]
- *
- *     librbfiles = File.join("**", "lib", "*.rb")
- *     Dir.glob(librbfiles)                #=> ["lib/song.rb"]
  */
 static VALUE
 dir_s_glob(argc, argv, obj)
@@ -1450,21 +1297,6 @@ dir_s_glob(argc, argv, obj)
     return rb_push_glob(str, flags);
 }
 
-static VALUE
-dir_open_dir(path)
-    VALUE path;
-{
-    VALUE dir = rb_funcall(rb_cDir, rb_intern("open"), 1, path);
-
-    if (TYPE(dir) != T_DATA ||
-	RDATA(dir)->dfree != (RUBY_DATA_FUNC)free_dir) {
-	rb_raise(rb_eTypeError, "wrong argument type %s (expected Dir)",
-		 rb_obj_classname(dir));
-    }
-    return dir;
-}
-
-
 /*
  *  call-seq:
  *     Dir.foreach( dirname ) {| filename | block }  => nil
@@ -1488,7 +1320,7 @@ dir_foreach(io, dirname)
 {
     VALUE dir;
 
-    dir = dir_open_dir(dirname);
+    dir = rb_funcall(rb_cDir, rb_intern("open"), 1, dirname);
     rb_ensure(dir_each, dir, dir_close, dir);
     return Qnil;
 }
@@ -1510,7 +1342,7 @@ dir_entries(io, dirname)
 {
     VALUE dir;
 
-    dir = dir_open_dir(dirname);
+    dir = rb_funcall(rb_cDir, rb_intern("open"), 1, dirname);
     return rb_ensure(rb_Array, dir, dir_close, dir);
 }
 
@@ -1524,27 +1356,8 @@ dir_entries(io, dirname)
  *  similar to shell filename globbing. It may contain the following
  *  metacharacters:
  *
- *  <code>*</code>::        Matches any file. Can be restricted by
- *                          other values in the glob. <code>*</code>
- *                          will match all files; <code>c*</code> will
- *                          match all files beginning with
- *                          <code>c</code>; <code>*c</code> will match
- *                          all files ending with <code>c</code>; and
- *                          <code>*c*</code> will match all files that
- *                          have <code>c</code> in them (including at
- *                          the beginning or end). Equivalent to
- *                          <code>/ .* /x</code> in regexp.
- *  <code>?</code>::        Matches any one character. Equivalent to
- *                          <code>/.{1}/</code> in regexp.
- *  <code>[set]</code>::    Matches any one character in +set+.
- *                          Behaves exactly like character sets in
- *                          Regexp, including set negation
- *                          (<code>[^a-z]</code>).
- *  <code>\</code>::        Escapes the next metacharacter.
- *
- *  <i>flags</i> is a bitwise OR of the <code>FNM_xxx</code>
- *  parameters. The same glob pattern and flags are used by
- *  <code>Dir::glob</code>.
+ *  <i>flags</i> is a bitwise OR of the <code>FNM_xxx</code> parameters.
+ *  The same glob pattern and flags are used by <code>Dir::glob</code>.
  *
  *     File.fnmatch('cat',       'cat')        #=> true
  *     File.fnmatch('cat',       'category')   #=> false
@@ -1649,5 +1462,4 @@ Init_Dir()
     rb_file_const("FNM_PATHNAME", INT2FIX(FNM_PATHNAME));
     rb_file_const("FNM_DOTMATCH", INT2FIX(FNM_DOTMATCH));
     rb_file_const("FNM_CASEFOLD", INT2FIX(FNM_CASEFOLD));
-    rb_file_const("FNM_SYSCASE", INT2FIX(FNM_SYSCASE));
 }
diff --git a/distruby.rb b/distruby.rb
deleted file mode 100644
index 613da0eb9c..0000000000
--- a/distruby.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-#!./miniruby
-
-if RUBY_PATCHLEVEL.zero?
-	dirname = sprintf 'ruby-%s', RUBY_VERSION
-	tagname = dirname.gsub /ruby-(\d)\.(\d)\.(\d)/, 'v\1_\2_\3'
-else
-	dirname = sprintf 'ruby-%s-p%u', RUBY_VERSION, RUBY_PATCHLEVEL
-	tagname = dirname.gsub /ruby-(\d)\.(\d)\.(\d)-p/, 'v\1_\2_\3_'
-end
-tgzname = dirname + '.tar.gz'
-tbzname = dirname + '.tar.bz2'
-zipname = dirname + '.zip'
-repos   = 'http://svn.ruby-lang.org/repos/ruby/tags/' + tagname
-
-STDERR.puts 'exporting sources...'
-system 'svn',  'export',  '-q', repos, dirname
-Dir.chdir dirname do
-	STDERR.puts 'generating configure...'
-	system 'autoconf'
-	system 'rm', '-rf', 'autom4te.cache'
-
-	STDERR.puts 'generating parse.c...'
-	system 'bison', '-y', '-o', 'parse.c', 'parse.y'
-end
-
-STDERR.puts 'generating tarballs...'
-ENV['GZIP'] = '-9'
-system 'tar', 'chofzp', tgzname, dirname
-system 'tar', 'chojfp', tbzname, dirname
-system 'zip', '-q9r', zipname, dirname
-
-require 'digest/md5'
-require 'digest/sha2'
-for name in [tgzname, tbzname, zipname] do
-	open name, 'rb' do |fp|
-		str = fp.read
-		md5 = Digest::MD5.hexdigest str
-		sha = Digest::SHA256.hexdigest str
-		printf "MD5(%s)= %s\nSHA256(%s)= %s\nSIZE(%s)= %s\n\n",
-				 name, md5,
-				 name, sha,
-				 name, str.size
-	end
-end
-
-
-
-# 
-# Local Variables:
-# mode: ruby
-# code: utf-8
-# indent-tabs-mode: t
-# tab-width: 3
-# ruby-indent-level: 3
-# fill-column: 79
-# default-justification: full
-# End:
-# vi: ts=3 sw=3
-
diff --git a/djgpp/configure.bat b/djgpp/configure.bat
index e6a5d79d4a..e6a5d79d4a 100755..100644
--- a/djgpp/configure.bat
+++ b/djgpp/configure.bat
diff --git a/dln.c b/dln.c
index 016d0c12a2..8f0b2a0409 100644
--- a/dln.c
+++ b/dln.c
@@ -2,8 +2,8 @@
 
   dln.c -
 
-  $Author: matz $
-  $Date: 2006/08/07 03:43:39 $
+  $Author$
+  $Date$
   created at: Tue Jan 18 17:05:06 JST 1994
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -27,6 +27,10 @@
 char *dln_argv0;
 #endif
 
+#ifdef _AIX
+#pragma alloca
+#endif
+
 #if defined(HAVE_ALLOCA_H)
 #include <alloca.h>
 #endif
@@ -85,7 +89,7 @@ char *getenv();
 # include <image.h>
 #endif
 
-#ifndef NO_DLN_LOAD
+int eaccess();
 
 #if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(_AIX) && !defined(__APPLE__) && !defined(_UNICOSMP)
 /* dynamic load with dlopen() */
@@ -156,7 +160,7 @@ static int dln_errno;
 
 #define DLN_ENOEXEC	ENOEXEC	/* Exec format error */
 #define DLN_ECONFL	1201	/* Symbol name conflict */
-#define DLN_ENOINIT	1202	/* No initializer given */
+#define DLN_ENOINIT	1202	/* No inititalizer given */
 #define DLN_EUNDEF	1203	/* Undefine symbol remains */
 #define DLN_ENOTLIB	1204	/* Not a library file */
 #define DLN_EBADLIB	1205	/* Malformed library file */
@@ -391,7 +395,7 @@ dln_init(prog)
 	if (c != '!') goto err_noexec;
 
 	p = buf;
-	/* skip forwarding spaces */
+	/* skip forwading spaces */
 	while (read(fd, &c, 1) == 1) {
 	    if (c == '\n') goto err_noexec;
 	    if (c != '\t' && c != ' ') {
@@ -956,9 +960,8 @@ load_lib(lib)
     dln_errno = DLN_EBADLIB;
 
     if (lib[0] == '-' && lib[1] == 'l') {
-	long len = strlen(lib) + 4;
-	char *p = alloca(len);
-	snprintf(p, len, "lib%s.a", lib+2);
+	char *p = alloca(strlen(lib) + 4);
+	sprintf(p, "lib%s.a", lib+2);
 	lib = p;
     }
 
@@ -1112,7 +1115,7 @@ dln_sym(name)
 #endif /* USE_DLN_A_OUT */
 
 #ifdef USE_DLN_DLOPEN
-# if defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ < 105000000
+# ifdef __NetBSD__
 #  include <nlist.h>
 #  include <link.h>
 # else
@@ -1271,16 +1274,10 @@ static int vms_fileact(char *filespec, int type);
 static long vms_fisexh(long *sigarr, long *mecarr);
 #endif
 
-#endif /* NO_DLN_LOAD */
-
 void*
 dln_load(file)
     const char *file;
 {
-#ifdef NO_DLN_LOAD
-    rb_raise(rb_eLoadError, "this executable file can't load extension libraries");
-#else
-
 #if !defined(_AIX) && !defined(NeXT)
     const char *error = 0;
 #define DLN_ERROR() (error = dln_strerror(), strcpy(ALLOCA_N(char, strlen(error) + 1), error))
@@ -1636,8 +1633,6 @@ dln_load(file)
   failed:
     rb_loaderror("%s - %s", error, file);
 #endif
-
-#endif /* NO_DLN_LOAD */
     return 0;			/* dummy return */
 }
 
@@ -1687,7 +1682,6 @@ conv_to_posix_path(win32, posix, len)
     char *p = win32;
     char *dst = posix;
 
-    posix[0] = '\0';
     for (p = win32; *p; p++)
 	if (*p == ';') {
 	    *p = 0;
diff --git a/dln.h b/dln.h
index 3d52ea2827..182cf9f9f4 100644
--- a/dln.h
+++ b/dln.h
@@ -2,8 +2,8 @@
 
   dln.h -
 
-  $Author: michal $
-  $Date: 2003/01/16 07:34:01 $
+  $Author$
+  $Date$
   created at: Wed Jan 19 16:53:09 JST 1994
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
diff --git a/dmydln.c b/dmydln.c
deleted file mode 100644
index 09ea06806c..0000000000
--- a/dmydln.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define NO_DLN_LOAD 1
-#include "dln.c"
diff --git a/doc/forwardable.rd b/doc/forwardable.rd
index f9c8234761..7272c374b6 100644
--- a/doc/forwardable.rd
+++ b/doc/forwardable.rd
@@ -1,8 +1,8 @@
  -- forwardable.rb
 						
                                                 $Release Version: 1.1 $
-                                                $Revision: 1.2 $
-                                                $Date: 2001/05/07 23:52:57 $
+                                                $Revision$
+                                                $Date$
 						Original version by Tosh
 
 =begin
diff --git a/doc/forwardable.rd.ja b/doc/forwardable.rd.ja
index a56823dd1a..d928fddc5e 100644
--- a/doc/forwardable.rd.ja
+++ b/doc/forwardable.rd.ja
@@ -1,7 +1,7 @@
   -- forwatable.rb
                                                 $Release Version: 1.1 $
-                                                $Revision: 1.1 $
-                                                $Date: 2001/07/19 05:42:06 $
+                                                $Revision$
+                                                $Date$
 
 =begin
 = Forwardable
diff --git a/doc/irb/irb-tools.rd.ja b/doc/irb/irb-tools.rd.ja
index 38145576dc..64d9ab29c8 100644
--- a/doc/irb/irb-tools.rd.ja
+++ b/doc/irb/irb-tools.rd.ja
@@ -1,7 +1,7 @@
 irb��Ϣ���ޤ����ޥ�ɤȥ饤�֥��
 				$Release Version: 0.7.1 $
-			   	$Revision: 1.1 $
-			   	$Date: 2001/07/19 05:42:06 $
+			   	$Revision$
+			   	$Date$
 			   	by Keiju ISHITSUKA(Nihon Rational Co.,Ltd.)
 
 =begin
diff --git a/doc/irb/irb.rd b/doc/irb/irb.rd
index f56e8b60e0..a42cd46680 100644
--- a/doc/irb/irb.rd
+++ b/doc/irb/irb.rd
@@ -1,7 +1,7 @@
 irb -- interactive ruby
 		$Release Version: 0.9 $
-		$Revision: 1.6 $
-		$Date: 2003/07/31 16:34:07 $
+		$Revision$
+		$Date$
 		by Keiju ISHITSUKA(keiju@ishitsuka.com)
 		by gotoken-san who is original translater from japanese version
 
diff --git a/doc/irb/irb.rd.ja b/doc/irb/irb.rd.ja
index aa3c0e13aa..bf8ac5d517 100644
--- a/doc/irb/irb.rd.ja
+++ b/doc/irb/irb.rd.ja
@@ -1,8 +1,8 @@
 irb -- interactive ruby
-				$Release Version: 0.9.5 $
-			   	$Revision: 1.3.2.1 $
-			   	$Date: 2005/04/19 19:24:56 $
-			   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
+				$Release Version: 0.9 $
+			   	$Revision$
+			   	$Date$
+			   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 =begin
 = irb�Ȥ�?
 
@@ -112,7 +112,6 @@ irb��ư����``~/.irbrc''���ɤ߹��ߤޤ�. �⤷¸�ߤ��ʤ�����,
 
    IRB.conf[:PROMPT][:MY_PROMPT] = { # �ץ���ץȥ⡼�ɤ�̾��
      :PROMPT_I => nil,		  # �̾�Υץ���ץ�
-     :PROMPT_N => nil,		  # ��³�ԤΥץ���ץ�
      :PROMPT_S => nil,		  # ʸ����ʤɤη�³�ԤΥץ���ץ�
      :PROMPT_C => nil,		  # ������³���Ƥ�����Υץ���ץ�
      :RETURN => "    ==>%s\n"	  # �꥿������Υץ���ץ�
@@ -127,7 +126,7 @@ OK�Ǥ�.
 
   IRB.conf[:PROMPT_MODE] = :MY_PROMPT
 
-PROMPT_I, PROMPT_N, PROMPT_S, PROMPT_C��, �ե����ޥåȤ���ꤷ�ޤ�.
+PROMPT_I, PROMPT_S, PROMPT_C��, �ե����ޥåȤ���ꤷ�ޤ�.
 
   %N	��ư���Ƥ��륳�ޥ��̾�����Ϥ����.
   %m	main���֥�������(self)��to_s�ǽ��Ϥ����.
@@ -142,7 +141,6 @@ PROMPT_I, PROMPT_N, PROMPT_S, PROMPT_C��, �ե����ޥåȤ���ꤷ�ޤ�.
 
   IRB.conf[:PROMPT_MODE][:DEFAULT] = {
       :PROMPT_I => "%N(%m):%03n:%i> ",
-      :PROMPT_N => "%N(%m):%03n:%i> ",
       :PROMPT_S => "%N(%m):%03n:%i%l ",
       :PROMPT_C => "%N(%m):%03n:%i* ",
       :RETURN => "%s\n"
diff --git a/doc/shell.rd b/doc/shell.rd
index ae6855cbd8..02ee1b020a 100644
--- a/doc/shell.rd
+++ b/doc/shell.rd
@@ -1,7 +1,7 @@
  -- shell.rb
 				$Release Version: 0.6.0 $
-			   	$Revision: 1.2 $
-			   	$Date: 2001/05/17 10:09:49 $
+			   	$Revision$
+			   	$Date$
 			   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 
 =begin
diff --git a/doc/shell.rd.ja b/doc/shell.rd.ja
index aab9e5c7d2..073e71ea42 100644
--- a/doc/shell.rd.ja
+++ b/doc/shell.rd.ja
@@ -1,7 +1,7 @@
  -- shell.rb
 				$Release Version: 0.6.0 $
-			   	$Revision: 1.1 $
-			   	$Date: 2001/07/19 05:42:06 $
+			   	$Revision$
+			   	$Date$
 			   	by Keiju ISHITSUKA(keiju@ishitsuka.com)
 
 =begin
diff --git a/enum.c b/enum.c
index 112a5f820b..a745a6e604 100644
--- a/enum.c
+++ b/enum.c
@@ -2,8 +2,8 @@
 
   enum.c -
 
-  $Author: drbrain $
-  $Date: 2006/06/15 01:24:40 $
+  $Author$
+  $Date$
   created at: Fri Oct  1 15:15:19 JST 1993
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -80,10 +80,11 @@ enum_grep(obj, pat)
 static VALUE
 find_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     if (RTEST(rb_yield(i))) {
-	*memo = i;
+	memo->u2.value = Qtrue;
+	memo->u1.value = i;
 	rb_iter_break();
     }
     return Qnil;
@@ -110,13 +111,13 @@ enum_find(argc, argv, obj)
     VALUE* argv;
     VALUE obj;
 {
-    VALUE memo = Qundef;
+    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, Qfalse, 0);
     VALUE if_none;
 
     rb_scan_args(argc, argv, "01", &if_none);
-    rb_iterate(rb_each, obj, find_i, (VALUE)&memo);
-    if (memo != Qundef) {
-	return memo;
+    rb_iterate(rb_each, obj, find_i, (VALUE)memo);
+    if (memo->u2.value) {
+	return memo->u1.value;
     }
     if (!NIL_P(if_none)) {
 	return rb_funcall(if_none, rb_intern("call"), 0, 0);
@@ -256,13 +257,14 @@ enum_to_a(obj)
 static VALUE
 inject_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
-    if (*memo == Qundef) {
-        *memo = i;
+    if (memo->u2.value) {
+        memo->u2.value = Qfalse;
+        memo->u1.value = i;
     }
     else {
-        *memo = rb_yield_values(2, *memo, i);
+        memo->u1.value = rb_yield_values(2, memo->u1.value, i);
     }
     return Qnil;
 }
@@ -303,13 +305,18 @@ enum_inject(argc, argv, obj)
     int argc;
     VALUE *argv, obj;
 {
-    VALUE memo = Qundef;
+    NODE *memo;
+    VALUE n;
 
-    if (rb_scan_args(argc, argv, "01", &memo) == 0)
-	memo = Qundef;
-    rb_iterate(rb_each, obj, inject_i, (VALUE)&memo);
-    if (memo == Qundef) return Qnil;
-    return memo;
+    if (rb_scan_args(argc, argv, "01", &n) == 1) {
+        memo = rb_node_newnode(NODE_MEMO, n, Qfalse, 0);
+    }
+    else {
+        memo = rb_node_newnode(NODE_MEMO, Qnil, Qtrue, 0);
+    }
+    rb_iterate(rb_each, obj, inject_i, (VALUE)memo);
+    n = memo->u1.value;
+    return n;
 }
 
 static VALUE
@@ -500,10 +507,10 @@ enum_sort_by(obj)
 static VALUE
 all_iter_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     if (!RTEST(rb_yield(i))) {
-	*memo = Qfalse;
+	memo->u1.value = Qfalse;
 	rb_iter_break();
     }
     return Qnil;
@@ -512,10 +519,10 @@ all_iter_i(i, memo)
 static VALUE
 all_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     if (!RTEST(i)) {
-	*memo = Qfalse;
+	memo->u1.value = Qfalse;
 	rb_iter_break();
     }
     return Qnil;
@@ -542,19 +549,22 @@ static VALUE
 enum_all(obj)
     VALUE obj;
 {
-    VALUE result = Qtrue;
+    VALUE result;
+    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? all_iter_i : all_i, (VALUE)&result);
+    memo->u1.value = Qtrue;
+    rb_iterate(rb_each, obj, rb_block_given_p() ? all_iter_i : all_i, (VALUE)memo);
+    result = memo->u1.value;
     return result;
 }
 
 static VALUE
 any_iter_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     if (RTEST(rb_yield(i))) {
-	*memo = Qtrue;
+	memo->u1.value = Qtrue;
 	rb_iter_break();
     }
     return Qnil;
@@ -563,10 +573,10 @@ any_iter_i(i, memo)
 static VALUE
 any_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     if (RTEST(i)) {
-	*memo = Qtrue;
+	memo->u1.value = Qtrue;
 	rb_iter_break();
     }
     return Qnil;
@@ -578,7 +588,7 @@ any_i(i, memo)
  *  
  *  Passes each element of the collection to the given block. The method
  *  returns <code>true</code> if the block ever returns a value other
- *  than <code>false</code> or <code>nil</code>. If the block is not
+ *  that <code>false</code> or <code>nil</code>. If the block is not
  *  given, Ruby adds an implicit block of <code>{|obj| obj}</code> (that
  *  is <code>any?</code> will return <code>true</code> if at least one
  *  of the collection members is not <code>false</code> or
@@ -594,26 +604,29 @@ static VALUE
 enum_any(obj)
     VALUE obj;
 {
-    VALUE result = Qfalse;
+    VALUE result;
+    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? any_iter_i : any_i, (VALUE)&result);
+    memo->u1.value = Qfalse;
+    rb_iterate(rb_each, obj, rb_block_given_p() ? any_iter_i : any_i, (VALUE)memo);
+    result = memo->u1.value;
     return result;
 }
 
 static VALUE
 min_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     VALUE cmp;
 
-    if (*memo == Qundef) {
-	*memo = i;
+    if (NIL_P(memo->u1.value)) {
+	memo->u1.value = i;
     }
     else {
-	cmp = rb_funcall(i, id_cmp, 1, *memo);
-	if (rb_cmpint(cmp, i, *memo) < 0) {
-	    *memo = i;
+	cmp = rb_funcall(i, id_cmp, 1, memo->u1.value);
+	if (rb_cmpint(cmp, i, memo->u1.value) < 0) {
+	    memo->u1.value = i;
 	}
     }
     return Qnil;
@@ -622,17 +635,17 @@ min_i(i, memo)
 static VALUE
 min_ii(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     VALUE cmp;
 
-    if (*memo == Qundef) {
-	*memo = i;
+    if (NIL_P(memo->u1.value)) {
+	memo->u1.value = i;
     }
     else {
-	cmp = rb_yield_values(2, i, *memo);
-	if (rb_cmpint(cmp, i, *memo) < 0) {
-	    *memo = i;
+	cmp = rb_yield_values(2, i, memo->u1.value);
+	if (rb_cmpint(cmp, i, memo->u1.value) < 0) {
+	    memo->u1.value = i;
 	}
     }
     return Qnil;
@@ -657,10 +670,11 @@ static VALUE
 enum_min(obj)
     VALUE obj;
 {
-    VALUE result = Qundef;
+    VALUE result;
+    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? min_ii : min_i, (VALUE)&result);
-    if (result == Qundef) return Qnil;
+    rb_iterate(rb_each, obj, rb_block_given_p() ? min_ii : min_i, (VALUE)memo);
+    result = memo->u1.value;
     return result;
 }
 
@@ -681,17 +695,17 @@ enum_min(obj)
 static VALUE
 max_i(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     VALUE cmp;
 
-    if (*memo == Qundef) {
-	*memo = i;
+    if (NIL_P(memo->u1.value)) {
+	memo->u1.value = i;
     }
     else {
-	cmp = rb_funcall(i, id_cmp, 1, *memo);
-	if (rb_cmpint(cmp, i, *memo) > 0) {
-	    *memo = i;
+	cmp = rb_funcall(i, id_cmp, 1, memo->u1.value);
+	if (rb_cmpint(cmp, i, memo->u1.value) > 0) {
+	    memo->u1.value = i;
 	}
     }
     return Qnil;
@@ -700,17 +714,17 @@ max_i(i, memo)
 static VALUE
 max_ii(i, memo)
     VALUE i;
-    VALUE *memo;
+    NODE *memo;
 {
     VALUE cmp;
 
-    if (*memo == Qundef) {
-	*memo = i;
+    if (NIL_P(memo->u1.value)) {
+	memo->u1.value = i;
     }
     else {
-	cmp = rb_yield_values(2, i, *memo);
-	if (rb_cmpint(cmp, i, *memo) > 0) {
-	    *memo = i;
+	cmp = rb_yield_values(2, i, memo->u1.value);
+	if (rb_cmpint(cmp, i, memo->u1.value) > 0) {
+	    memo->u1.value = i;
 	}
     }
     return Qnil;
@@ -734,20 +748,21 @@ static VALUE
 enum_max(obj)
     VALUE obj;
 {
-    VALUE result = Qundef;
+    VALUE result;
+    NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
 
-    rb_iterate(rb_each, obj, rb_block_given_p() ? max_ii : max_i, (VALUE)&result);
-    if (result == Qundef) return Qnil;
+    rb_iterate(rb_each, obj, rb_block_given_p() ? max_ii : max_i, (VALUE)memo);
+    result = memo->u1.value;
     return result;
 }
 
 static VALUE
 member_i(item, memo)
     VALUE item;
-    VALUE *memo;
+    NODE *memo;
 {
-    if (rb_equal(item, memo[0])) {
-	memo[1] = Qtrue;
+    if (rb_equal(item, memo->u1.value)) {
+	memo->u2.value = Qtrue;
 	rb_iter_break();
     }
     return Qnil;
@@ -770,21 +785,21 @@ static VALUE
 enum_member(obj, val)
     VALUE obj, val;
 {
-    VALUE memo[2];
+    VALUE result;
+    NODE *memo = rb_node_newnode(NODE_MEMO, val, Qfalse, 0);
 
-    memo[0] = val;
-    memo[1] = Qfalse;
     rb_iterate(rb_each, obj, member_i, (VALUE)memo);
-    return memo[1];
+    result = memo->u2.value;
+    return result;
 }
 
 static VALUE
 each_with_index_i(val, memo)
     VALUE val;
-    VALUE *memo;
+    NODE *memo;
 {
-    rb_yield_values(2, val, INT2FIX(*memo));
-    ++*memo;
+    rb_yield_values(2, val, INT2FIX(memo->u3.cnt));
+    memo->u3.cnt++;
     return Qnil;
 }
 
@@ -807,21 +822,20 @@ static VALUE
 enum_each_with_index(obj)
     VALUE obj;
 {
-    VALUE memo = 0;
+    NODE *memo = rb_node_newnode(NODE_MEMO, 0, 0, 0);
 
-    rb_need_block();
-    rb_iterate(rb_each, obj, each_with_index_i, (VALUE)&memo);
+    rb_iterate(rb_each, obj, each_with_index_i, (VALUE)memo);
     return obj;
 }
 
 static VALUE
 zip_i(val, memo)
     VALUE val;
-    VALUE *memo;
+    NODE *memo;
 {
-    VALUE result = memo[0];
-    VALUE args = memo[1];
-    int idx = memo[2]++;
+    VALUE result = memo->u1.value;
+    VALUE args = memo->u2.value;
+    int idx = memo->u3.cnt++;
     VALUE tmp;
     int i;
 
@@ -870,15 +884,13 @@ enum_zip(argc, argv, obj)
 {
     int i;
     VALUE result;
-    VALUE memo[3];
+    NODE *memo;
 
     for (i=0; i<argc; i++) {
 	argv[i] = rb_convert_type(argv[i], T_ARRAY, "Array", "to_a");
     }
     result = rb_block_given_p() ? Qnil : rb_ary_new();
-    memo[0] = result;
-    memo[1] = rb_ary_new4(argc, argv);
-    memo[2] = 0;
+    memo = rb_node_newnode(NODE_MEMO, result, rb_ary_new4(argc, argv), 0);
     rb_iterate(rb_each, obj, zip_i, (VALUE)memo);
 
     return result;
diff --git a/env.h b/env.h
index 196090f387..c47c01d9db 100644
--- a/env.h
+++ b/env.h
@@ -2,8 +2,8 @@
 
   env.h -
 
-  $Author: matz $
-  $Date: 2006/02/13 09:10:55 $
+  $Author$
+  $Date$
   created at: Mon Jul 11 11:53:03 JST 1994
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -16,6 +16,7 @@
 extern struct FRAME {
     VALUE self;
     int argc;
+    VALUE *argv;
     ID last_func;
     ID orig_func;
     VALUE last_class;
@@ -29,8 +30,8 @@ extern struct FRAME {
 
 void rb_gc_mark_frame _((struct FRAME *));
 
-#define FRAME_DMETH  1
-#define FRAME_FUNC   2
+#define FRAME_ALLOCA 0
+#define FRAME_MALLOC 1
 
 extern struct SCOPE {
     struct RBasic super;
@@ -43,7 +44,6 @@ extern struct SCOPE {
 #define SCOPE_MALLOC  1
 #define SCOPE_NOSTACK 2
 #define SCOPE_DONT_RECYCLE 4
-#define SCOPE_CLONE   8
 
 extern int ruby_in_eval;
 
diff --git a/error.c b/error.c
index 93093e0e0f..c67fce9d34 100644
--- a/error.c
+++ b/error.c
@@ -2,8 +2,8 @@
 
   error.c -
 
-  $Author: matz $
-  $Date: 2006/07/20 07:04:13 $
+  $Author$
+  $Date$
   created at: Mon Aug  9 16:11:34 JST 1993
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -303,7 +303,7 @@ VALUE rb_eNoMethodError;
 VALUE rb_eSecurityError;
 VALUE rb_eNotImpError;
 VALUE rb_eNoMemError;
-VALUE rb_cNameErrorMesg;
+static VALUE rb_cNameErrorMesg;
 
 VALUE rb_eScriptError;
 VALUE rb_eSyntaxError;
@@ -553,7 +553,7 @@ exit_initialize(argc, argv, exc)
 	status = *argv++;
 	--argc;
     }
-    rb_call_super(argc, argv);
+    exc_initialize(argc, argv, exc);
     rb_iv_set(exc, "status", status);
     return exc;
 }
@@ -633,7 +633,7 @@ name_err_initialize(argc, argv, self)
     VALUE name;
 
     name = (argc > 1) ? argv[--argc] : Qnil;
-    rb_call_super(argc, argv);
+    exc_initialize(argc, argv, self);
     rb_iv_set(self, "name", name);
     return self;
 }
@@ -678,7 +678,7 @@ name_err_to_s(exc)
  * call-seq:
  *   NoMethodError.new(msg, name [, args])  => no_method_error
  *
- * Construct a NoMethodError exception for a method of the given name
+ * Contruct a NoMethodError exception for a method of the given name
  * called with the given arguments. The name may be accessed using
  * the <code>#name</code> method on the resulting object, and the
  * arguments using the <code>#args</code> method.
@@ -907,19 +907,16 @@ syserr_initialize(argc, argv, self)
     else err = "unknown error";
     if (!NIL_P(mesg)) {
 	VALUE str = mesg;
-	size_t len;
-
 	StringValue(str);
-	len = strlen(err)+RSTRING(str)->len+3;
-	mesg = rb_str_new(0, len);
-	snprintf(RSTRING(mesg)->ptr, len+1, "%s - %.*s", err,
+	mesg = rb_str_new(0, strlen(err)+RSTRING(mesg)->len+3);
+	sprintf(RSTRING(mesg)->ptr, "%s - %.*s", err,
 		(int)RSTRING(str)->len, RSTRING(str)->ptr);
 	rb_str_resize(mesg, strlen(RSTRING(mesg)->ptr));
     }
     else {
 	mesg = rb_str_new2(err);
     }
-    rb_call_super(1, &mesg);
+    exc_initialize(1, &mesg, self);
     rb_iv_set(self, "errno", error);
     return self;
 }
@@ -1083,7 +1080,7 @@ void
 rb_notimplement()
 {
     rb_raise(rb_eNotImpError,
-	     "%s() function is unimplemented on this machine",
+	     "The %s() function is unimplemented on this machine",
 	     rb_id2name(ruby_frame->last_func));
 }
 
@@ -1111,6 +1108,7 @@ void
 rb_sys_fail(mesg)
     const char *mesg;
 {
+    extern int errno;
     int n = errno;
     VALUE arg;
 
diff --git a/eval.c b/eval.c
index 520eb987af..043f349bbd 100644
--- a/eval.c
+++ b/eval.c
@@ -2,8 +2,8 @@
 
   eval.c -
 
-  $Author: shyouhei $
-  $Date: 2007/01/27 15:45:49 $
+  $Author$
+  $Date$
   created at: Thu Jun 10 14:22:17 JST 1993
 
   Copyright (C) 1993-2003 Yukihiro Matsumoto
@@ -32,8 +32,9 @@
 #if defined(HAVE_GETCONTEXT) && defined(HAVE_SETCONTEXT)
 #include <ucontext.h>
 #define USE_CONTEXT
-#endif
+#else
 #include <setjmp.h>
+#endif
 
 #include "st.h"
 #include "dln.h"
@@ -53,7 +54,9 @@
 # ifdef HAVE_ALLOCA_H
 #  include <alloca.h>
 # else
-#  ifndef _AIX
+#  ifdef _AIX
+ #pragma alloca
+#  else
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
 void *alloca ();
 #   endif
@@ -85,16 +88,14 @@ char *strrchr _((const char*,const char));
 #include "macruby_private.h"
 #endif
 
-#ifdef __VMS
-#include "vmsruby_private.h"
-#endif
-
 #ifdef USE_CONTEXT
 typedef struct {
     ucontext_t context;
     volatile int status;
 } rb_jmpbuf_t[1];
 
+#undef longjmp
+#undef setjmp
 NORETURN(static void rb_jump_context(rb_jmpbuf_t, int));
 static inline void
 rb_jump_context(env, val)
@@ -105,110 +106,16 @@ rb_jump_context(env, val)
     setcontext(&env->context);
     abort();			/* ensure noreturn */
 }
-/*
- * PRE_GETCONTEXT and POST_GETCONTEXT is a magic for getcontext, gcc,
- * IA64 register stack and SPARC register window combination problem.
- *
- * Assume following code sequence.
- * 
- * 1. set a register in the register stack/window such as r32/l0.
- * 2. call getcontext.
- * 3. use the register.
- * 4. update the register for other use.
- * 5. call setcontext indirectly (or directly).
- *
- * This code should be run as 1->2->3->4->5->3->4.
- * But after second getcontext return (second 3),
- * the register is broken (updated).
- * It's because getcontext/setcontext doesn't preserve the content of the
- * register stack/window.
- *
- * setjmp also doesn't preserve the content of the register stack/window.
- * But it has not the problem because gcc knows setjmp may return twice.
- * gcc detects setjmp and generates setjmp safe code.
- *
- * So setjmp calls before and after the getcontext call makes the code
- * somewhat safe.
- * It fix the problem on IA64.
- * It is not required that setjmp is called at run time, since the problem is
- * register usage.
- *
- * Since the magic setjmp is not enough for SPARC,
- * inline asm is used to prohibit registers in register windows.
- *
- * Since the problem is fixed at gcc 4.0.3, the magic is applied only for
- * prior versions of gcc.
- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21957
- * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22127
- */
-#  define GCC_VERSION_BEFORE(major, minor, patchlevel) \
-    (defined(__GNUC__) && !defined(__INTEL_COMPILER) && \
-     ((__GNUC__ < (major)) ||  \
-      (__GNUC__ == (major) && __GNUC_MINOR__ < (minor)) || \
-      (__GNUC__ == (major) && __GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ < (patchlevel))))
-#  if GCC_VERSION_BEFORE(4,0,3) && (defined(sparc) || defined(__sparc__))
-#    ifdef __pic__
-/*
- * %l7 is excluded for PIC because it is PIC register.
- * http://lists.freebsd.org/pipermail/freebsd-sparc64/2006-January/003739.html
- */
-#      define PRE_GETCONTEXT \
-	 ({ __asm__ volatile ("" : : :  \
-	    "%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \
-	    "%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", \
-	    "%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); })
-#    else
-#      define PRE_GETCONTEXT \
-	 ({ __asm__ volatile ("" : : :  \
-	    "%o0", "%o1", "%o2", "%o3", "%o4", "%o5", "%o7", \
-	    "%l0", "%l1", "%l2", "%l3", "%l4", "%l5", "%l6", "%l7", \
-	    "%i0", "%i1", "%i2", "%i3", "%i4", "%i5", "%i7"); })
-#    endif
-#    define POST_GETCONTEXT PRE_GETCONTEXT
-#  elif GCC_VERSION_BEFORE(4,0,3) && defined(__ia64)
-static jmp_buf function_call_may_return_twice_jmp_buf;
-int function_call_may_return_twice_false_1 = 0;
-int function_call_may_return_twice_false_2 = 0;
-#    define PRE_GETCONTEXT \
-       (function_call_may_return_twice_false_1 ? \
-        setjmp(function_call_may_return_twice_jmp_buf) : \
-        0)
-#    define POST_GETCONTEXT \
-       (function_call_may_return_twice_false_2 ? \
-        setjmp(function_call_may_return_twice_jmp_buf) : \
-        0)
-#  elif defined(__FreeBSD__) && __FreeBSD__ < 7
-/*
- * workaround for FreeBSD/i386 getcontext/setcontext bug.
- * clear the carry flag by (0 ? ... : ...).
- * FreeBSD PR 92110 http://www.freebsd.org/cgi/query-pr.cgi?pr=92110
- * [ruby-dev:28263]
- */
-static int volatile freebsd_clear_carry_flag = 0;
-#    define PRE_GETCONTEXT \
-       (freebsd_clear_carry_flag ? (freebsd_clear_carry_flag = 0) : 0)
-#  endif
-#  ifndef PRE_GETCONTEXT
-#    define PRE_GETCONTEXT 0
-#  endif
-#  ifndef POST_GETCONTEXT
-#    define POST_GETCONTEXT 0
-#  endif
-#  define ruby_longjmp(env, val) rb_jump_context(env, val)
-#  define ruby_setjmp(j) ((j)->status = 0, \
-     PRE_GETCONTEXT, \
-     getcontext(&(j)->context), \
-     POST_GETCONTEXT, \
-     (j)->status)
+#define longjmp(env, val) rb_jump_context(env, val)
+#define setjmp(j) ((j)->status = 0, getcontext(&(j)->context), (j)->status)
 #else
 typedef jmp_buf rb_jmpbuf_t;
-#  if !defined(setjmp) && defined(HAVE__SETJMP)
-#    define ruby_setjmp(env) _setjmp(env)
-#    define ruby_longjmp(env,val) _longjmp(env,val)
-#  else
-#    define ruby_setjmp(env) setjmp(env)
-#    define ruby_longjmp(env,val) longjmp(env,val)
-#  endif
+#ifndef setjmp
+#ifdef HAVE__SETJMP
+#define setjmp(env) _setjmp(env)
+#define longjmp(env,val) _longjmp(env,val)
+#endif
+#endif
 #endif
 
 #include <sys/types.h>
@@ -226,16 +133,15 @@ typedef jmp_buf rb_jmpbuf_t;
 #include <sys/stat.h>
 
 VALUE rb_cProc;
-VALUE rb_cBinding;
+static VALUE rb_cBinding;
 static VALUE proc_invoke _((VALUE,VALUE,VALUE,VALUE));
 static VALUE rb_f_binding _((VALUE));
 static void rb_f_END _((void));
 static VALUE rb_f_block_given_p _((void));
 static VALUE block_pass _((VALUE,NODE*));
-
-VALUE rb_cMethod;
+static VALUE rb_cMethod;
 static VALUE method_call _((int, VALUE*, VALUE));
-VALUE rb_cUnboundMethod;
+static VALUE rb_cUnboundMethod;
 static VALUE umethod_bind _((VALUE, VALUE));
 static VALUE rb_mod_define_method _((int, VALUE*, VALUE));
 NORETURN(static void rb_raise_jump _((VALUE)));
@@ -365,8 +271,7 @@ rb_clear_cache_for_undef(klass, id)
     if (!ruby_running) return;
     ent = cache; end = ent + CACHE_SIZE;
     while (ent < end) {
-	if (ent->mid == id &&
-	    RCLASS(ent->origin)->m_tbl == RCLASS(klass)->m_tbl) {
+	if (ent->origin == klass && ent->mid == id) {
 	    ent->mid = 0;
 	}
 	ent++;
@@ -407,12 +312,7 @@ rb_clear_cache_by_class(klass)
 
 static ID init, eqq, each, aref, aset, match, missing;
 static ID added, singleton_added;
-static ID __id__, __send__, respond_to;
-
-#define NOEX_TAINTED 8
-#define NOEX_SAFE(n) ((n) >> 4)
-#define NOEX_WITH(n, v) ((n) | (v) << 4)
-#define NOEX_WITH_SAFE(n) NOEX_WITH(n, ruby_safe_level)
+static ID __id__, __send__;
 
 void
 rb_add_method(klass, mid, node, noex)
@@ -440,7 +340,7 @@ rb_add_method(klass, mid, node, noex)
     }
     if (OBJ_FROZEN(klass)) rb_error_frozen("class/module");
     rb_clear_cache_by_id(mid);
-    body = NEW_METHOD(node, NOEX_WITH_SAFE(noex));
+    body = NEW_METHOD(node, noex);
     st_insert(RCLASS(klass)->m_tbl, mid, (st_data_t)body);
     if (node && mid != ID_ALLOCATOR && ruby_running) {
 	if (FL_TEST(klass, FL_SINGLETON)) {
@@ -634,7 +534,7 @@ rb_enable_super(klass, name)
     VALUE klass;
     const char *name;
 {
-    rb_warn("rb_enable_super() is obsolete");
+    rb_warning("rb_enable_super() is obsolete");
 }
 
 static void
@@ -701,7 +601,6 @@ rb_attr(klass, id, read, write, ex)
     char *buf;
     ID attriv;
     int noex;
-    size_t len;
 
     if (!ex) noex = NOEX_PUBLIC;
     else {
@@ -719,22 +618,20 @@ rb_attr(klass, id, read, write, ex)
 	}
     }
 
-    if (!rb_is_local_id(id) && !rb_is_const_id(id)) {
-	rb_name_error(id, "invalid attribute name `%s'", rb_id2name(id));
-    }
     name = rb_id2name(id);
     if (!name) {
 	rb_raise(rb_eArgError, "argument needs to be symbol or string");
     }
-    len = strlen(name)+2;
-    buf = ALLOCA_N(char,len);
-    snprintf(buf, len, "@%s", name);
+    buf = ALLOCA_N(char,strlen(name)+2);
+    sprintf(buf, "@%s", name);
     attriv = rb_intern(buf);
     if (read) {
 	rb_add_method(klass, id, NEW_IVAR(attriv), noex);
     }
     if (write) {
-	rb_add_method(klass, rb_id_attrset(id), NEW_ATTRSET(attriv), noex);
+	sprintf(buf, "%s=", name);
+	id = rb_intern(buf);
+	rb_add_method(klass, id, NEW_ATTRSET(attriv), noex);
     }
 }
 
@@ -745,8 +642,8 @@ extern NODE *ruby_eval_tree_begin;
 extern NODE *ruby_eval_tree;
 extern int ruby_nerrs;
 
-VALUE rb_eLocalJumpError;
-VALUE rb_eSysStackError;
+static VALUE rb_eLocalJumpError;
+static VALUE rb_eSysStackError;
 
 extern VALUE ruby_top_self;
 
@@ -764,7 +661,8 @@ static unsigned long frame_unique = 0;
     _frame.node = ruby_current_node;	\
     _frame.iter = ruby_iter->iter;	\
     _frame.argc = 0;			\
-    _frame.flags = 0;			\
+    _frame.argv = 0;			\
+    _frame.flags = FRAME_ALLOCA;	\
     _frame.uniq = frame_unique++;	\
     ruby_frame = &_frame
 
@@ -797,7 +695,7 @@ struct BLOCK {
 #define BLOCK_LAMBDA  2
 
 static struct BLOCK *ruby_block;
-static unsigned long block_unique = 1;
+static unsigned long block_unique = 0;
 
 #define PUSH_BLOCK(v,b) do {		\
     struct BLOCK _block;		\
@@ -843,8 +741,6 @@ struct RVarmap *ruby_dyna_vars;
 
 #define DVAR_DONT_RECYCLE FL_USER2
 
-#define DMETHOD_P() (ruby_frame->flags & FRAME_DMETH)
-
 static struct RVarmap*
 new_dvar(id, value, prev)
     ID id;
@@ -983,7 +879,6 @@ static struct iter *ruby_iter;
 #define ITER_NOT 0
 #define ITER_PRE 1
 #define ITER_CUR 2
-#define ITER_PAS 3
 
 #define PUSH_ITER(i) do {		\
     struct iter _iter;			\
@@ -1027,12 +922,12 @@ static struct tag *prot_tag;
 #define PROT_LAMBDA INT2FIX(2)	/* 5 */
 #define PROT_YIELD  INT2FIX(3)	/* 7 */
 
-#define EXEC_TAG()    (FLUSH_REGISTER_WINDOWS, ruby_setjmp(prot_tag->buf))
+#define EXEC_TAG()    (FLUSH_REGISTER_WINDOWS, setjmp(prot_tag->buf))
 
 #define JUMP_TAG(st) do {		\
     ruby_frame = prot_tag->frame;	\
     ruby_iter = prot_tag->iter;		\
-    ruby_longjmp(prot_tag->buf,(st));	\
+    longjmp(prot_tag->buf,(st));	\
 } while (0)
 
 #define POP_TAG()			\
@@ -1118,32 +1013,9 @@ static VALUE module_setup _((VALUE,NODE*));
 static VALUE massign _((VALUE,NODE*,VALUE,int));
 static void assign _((VALUE,NODE*,VALUE,int));
 
-typedef struct event_hook {
-    rb_event_hook_func_t func;
-    rb_event_t events;
-    struct event_hook *next;
-} rb_event_hook_t;
-
-static rb_event_hook_t *event_hooks;
-
-#define EXEC_EVENT_HOOK(event, node, self, id, klass) \
-    do { \
-	rb_event_hook_t *hook = event_hooks; \
-        rb_event_hook_func_t hook_func; \
-        rb_event_t events; \
-	\
-	while (hook) { \
-            hook_func = hook->func; \
-            events = hook->events; \
-            hook = hook->next; \
-	    if (events & event) \
-		(*hook_func)(event, node, self, id, klass); \
-	} \
-    } while (0)
-
 static VALUE trace_func = 0;
 static int tracing = 0;
-static void call_trace_func _((rb_event_t,NODE*,VALUE,ID,VALUE));
+static void call_trace_func _((char*,NODE*,VALUE,ID,VALUE));
 
 #if 0
 #define SET_CURRENT_SOURCE() (ruby_sourcefile = ruby_current_node->nd_file, \
@@ -1189,7 +1061,7 @@ error_pos()
     if (ruby_sourcefile) {
 	if (ruby_frame->last_func) {
 	    warn_printf("%s:%d:in `%s'", ruby_sourcefile, ruby_sourceline,
-			rb_id2name(ruby_frame->orig_func));
+			rb_id2name(ruby_frame->last_func));
 	}
 	else if (ruby_sourceline == 0) {
 	    warn_printf("%s", ruby_sourcefile);
@@ -1205,9 +1077,7 @@ get_backtrace(info)
     VALUE info;
 {
     if (NIL_P(info)) return Qnil;
-    info = rb_funcall(info, rb_intern("backtrace"), 0);
-    if (NIL_P(info)) return Qnil;
-    return rb_check_array_type(info);
+    return rb_check_array_type(rb_funcall(info, rb_intern("backtrace"), 0));
 }
 
 static void
@@ -1276,7 +1146,6 @@ error_print()
 	if (elen == 0) {
 	    warn_print(": ");
 	    warn_print2(RSTRING(epath)->ptr, RSTRING(epath)->len);
-	    warn_print("\n");
 	}
 	else {
 	    char *tail  = 0;
@@ -1342,15 +1211,6 @@ int
 is_ruby_native_thread() {
     return NATIVETHREAD_EQUAL(ruby_thid, NATIVETHREAD_CURRENT());
 }
-
-# ifdef HAVE_NATIVETHREAD_KILL
-void
-ruby_native_thread_kill(sig)
-    int sig;
-{
-    NATIVETHREAD_KILL(ruby_thid, sig);
-}
-# endif
 #endif
 
 void
@@ -1396,8 +1256,6 @@ ruby_init()
 	rb_define_global_const("TOPLEVEL_BINDING", rb_f_binding(ruby_top_self));
 #ifdef __MACOS__
 	_macruby_init();
-#elif defined(__VMS)
-	_vmsruby_init();
 #endif
 	ruby_prog_init();
 	ALLOW_INTS;
@@ -1441,14 +1299,6 @@ static VALUE exception_error;
 static VALUE sysstack_error;
 
 static int
-sysexit_status(err)
-    VALUE err;
-{
-    VALUE st = rb_iv_get(err, "status");
-    return NUM2INT(st);
-}
-
-static int
 error_handle(ex)
     int ex;
 {
@@ -1494,7 +1344,8 @@ error_handle(ex)
       case TAG_RAISE:
       case TAG_FATAL:
 	if (rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
-	    status = sysexit_status(ruby_errinfo);
+	    VALUE st = rb_iv_get(ruby_errinfo, "status");
+	    status = NUM2INT(st);
 	}
 	else {
 	    error_print();
@@ -1544,7 +1395,6 @@ ruby_finalize_0()
 static void
 ruby_finalize_1()
 {
-    signal(SIGINT, SIG_DFL);
     ruby_errinfo = 0;
     rb_gc_call_finalizer_at_exit();
     trace_func = 0;
@@ -1675,7 +1525,22 @@ rb_eval_string_protect(str, state)
     const char *str;
     int *state;
 {
-    return rb_protect((VALUE (*)_((VALUE)))rb_eval_string, (VALUE)str, state);
+    VALUE result = Qnil;	/* OK */
+    int status;
+
+    PUSH_TAG(PROT_NONE);
+    if ((status = EXEC_TAG()) == 0) {
+	result = rb_eval_string(str);
+    }
+    POP_TAG();
+    if (state) {
+	*state = status;
+    }
+    if (status != 0) {
+	return Qnil;
+    }
+
+    return result;
 }
 
 VALUE
@@ -1693,6 +1558,7 @@ rb_eval_string_wrap(str, state)
     rb_extend_object(ruby_top_self, ruby_wrapper);
     PUSH_FRAME();
     ruby_frame->last_func = 0;
+    ruby_frame->orig_func = 0;
     ruby_frame->last_class = 0;
     ruby_frame->self = self;
     PUSH_CREF(ruby_wrapper);
@@ -1834,6 +1700,7 @@ rb_eval_cmd(cmd, arg, level)
     ruby_scope = top_scope;
     PUSH_FRAME();
     ruby_frame->last_func = 0;
+    ruby_frame->orig_func = 0;
     ruby_frame->last_class = 0;
     ruby_frame->self = ruby_top_self;
     PUSH_CREF(ruby_wrapper ? ruby_wrapper : rb_cObject);
@@ -1869,13 +1736,12 @@ ev_const_defined(cref, id, self)
     while (cbase && cbase->nd_next) {
 	struct RClass *klass = RCLASS(cbase->nd_clss);
 
-	if (!NIL_P(klass)) {
-	    if (klass->iv_tbl && st_lookup(klass->iv_tbl, id, &result)) {
-		if (result == Qundef && NIL_P(rb_autoload_p((VALUE)klass, id))) {
-		    return Qfalse;
-		}
-		return Qtrue;
+	if (NIL_P(klass)) return rb_const_defined(CLASS_OF(self), id);
+	if (klass->iv_tbl && st_lookup(klass->iv_tbl, id, &result)) {
+	    if (result == Qundef && NIL_P(rb_autoload_p((VALUE)klass, id))) {
+		return Qfalse;
 	    }
+	    return Qtrue;
 	}
 	cbase = cbase->nd_next;
     }
@@ -1894,19 +1760,17 @@ ev_const_get(cref, id, self)
     while (cbase && cbase->nd_next) {
 	VALUE klass = cbase->nd_clss;
 
-	if (!NIL_P(klass)) {
-	    while (RCLASS(klass)->iv_tbl &&
-		   st_lookup(RCLASS(klass)->iv_tbl, id, &result)) {
-		if (result == Qundef) {
-		    if (!RTEST(rb_autoload_load(klass, id))) break;
-		    continue;
-		}
-		return result;
+	if (NIL_P(klass)) return rb_const_get(CLASS_OF(self), id);
+	while (RCLASS(klass)->iv_tbl && st_lookup(RCLASS(klass)->iv_tbl, id, &result)) {
+	    if (result == Qundef) {
+		rb_autoload_load(klass, id);
+		continue;
 	    }
+	    return result;
 	}
 	cbase = cbase->nd_next;
     }
-    return rb_const_get(NIL_P(cref->nd_clss) ? CLASS_OF(self): cref->nd_clss, id);
+    return rb_const_get(cref->nd_clss, id);
 }
 
 static VALUE
@@ -2159,8 +2023,7 @@ rb_alias(klass, name, def)
 	}
     }
     st_insert(RCLASS(klass)->m_tbl, name,
-	      (st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin),
-				    NOEX_WITH_SAFE(orig->nd_noex)));
+      (st_data_t)NEW_METHOD(NEW_FBODY(body, def, origin), orig->nd_noex));
     if (singleton) {
 	rb_funcall(singleton, singleton_added, 1, ID2SYM(name));
     }
@@ -2219,26 +2082,26 @@ copy_node_scope(node, rval)
 #ifdef C_ALLOCA
 # define TMP_PROTECT NODE * volatile tmp__protect_tmp=0
 # define TMP_ALLOC(n)							\
-    (tmp__protect_tmp = NEW_NODE(NODE_ALLOCA,				\
-				 ALLOC_N(VALUE,n),tmp__protect_tmp,n),	\
+    (tmp__protect_tmp = rb_node_newnode(NODE_ALLOCA,			\
+			     ALLOC_N(VALUE,n),tmp__protect_tmp,n),	\
      (void*)tmp__protect_tmp->nd_head)
 #else
 # define TMP_PROTECT typedef int foobazzz
 # define TMP_ALLOC(n) ALLOCA_N(VALUE,n)
 #endif
 
-#define SETUP_ARGS0(anode,extra) do {\
+#define SETUP_ARGS0(anode,alen) do {\
     NODE *n = anode;\
     if (!n) {\
 	argc = 0;\
 	argv = 0;\
     }\
     else if (nd_type(n) == NODE_ARRAY) {\
-	argc=anode->nd_alen;\
+	argc=alen;\
 	if (argc > 0) {\
 	    int i;\
 	    n = anode;\
-	    argv = TMP_ALLOC(argc+extra);\
+	    argv = TMP_ALLOC(argc);\
 	    for (i=0;i<argc;i++) {\
 		argv[i] = rb_eval(self,n->nd_head);\
 		n=n->nd_next;\
@@ -2254,20 +2117,18 @@ copy_node_scope(node, rval)
 	if (TYPE(args) != T_ARRAY)\
 	    args = rb_ary_to_ary(args);\
 	argc = RARRAY(args)->len;\
-	argv = TMP_ALLOC(argc+extra);\
+	argv = ALLOCA_N(VALUE, argc);\
 	MEMCPY(argv, RARRAY(args)->ptr, VALUE, argc);\
     }\
 } while (0)
 
-#define SETUP_ARGS(anode) SETUP_ARGS0(anode,0)
+#define SETUP_ARGS(anode) SETUP_ARGS0(anode, anode->nd_alen)
 
 #define BEGIN_CALLARGS do {\
     struct BLOCK *tmp_block = ruby_block;\
     int tmp_iter = ruby_iter->iter;\
-    switch (tmp_iter) {\
-      case ITER_PRE:\
+    if (tmp_iter == ITER_PRE) {\
 	ruby_block = ruby_block->outer;\
-      case ITER_PAS:\
 	tmp_iter = ITER_NOT;\
     }\
     PUSH_ITER(tmp_iter)
@@ -2322,7 +2183,7 @@ is_defined(self, node, buf)
     switch (nd_type(node)) {
       case NODE_SUPER:
       case NODE_ZSUPER:
-	if (ruby_frame->last_func == 0) return 0;
+	if (ruby_frame->orig_func == 0) return 0;
 	else if (ruby_frame->last_class == 0) return 0;
 	val = ruby_frame->last_class;
 	if (rb_method_boundp(RCLASS(val)->super, ruby_frame->orig_func, 0)) {
@@ -2406,7 +2267,6 @@ is_defined(self, node, buf)
       case NODE_DASGN:
       case NODE_DASGN_CURR:
       case NODE_GASGN:
-      case NODE_IASGN:
       case NODE_CDECL:
       case NODE_CVDECL:
       case NODE_CVASGN:
@@ -2519,45 +2379,6 @@ rb_obj_is_proc(proc)
     return Qfalse;
 }
 
-void
-rb_add_event_hook(func, events)
-    rb_event_hook_func_t func;
-    rb_event_t events;
-{
-    rb_event_hook_t *hook;
-
-    hook = ALLOC(rb_event_hook_t);
-    hook->func = func;
-    hook->events = events;
-    hook->next = event_hooks;
-    event_hooks = hook;
-}
-
-int
-rb_remove_event_hook(func)
-    rb_event_hook_func_t func;
-{
-    rb_event_hook_t *prev, *hook;
-
-    prev = NULL;
-    hook = event_hooks;
-    while (hook) {
-	if (hook->func == func) {
-	    if (prev) {
-		prev->next = hook->next;
-	    }
-	    else {
-		event_hooks = hook->next;
-	    }
-	    xfree(hook);
-	    return 0;
-	}
-	prev = hook;
-	hook = hook->next;
-    }
-    return -1;
-}
-
 /*
  *  call-seq:
  *     set_trace_func(proc)    => proc
@@ -2606,54 +2427,19 @@ static VALUE
 set_trace_func(obj, trace)
     VALUE obj, trace;
 {
-    rb_event_hook_t *hook;
-
-    rb_secure(4);
     if (NIL_P(trace)) {
 	trace_func = 0;
-	rb_remove_event_hook(call_trace_func);
 	return Qnil;
     }
     if (!rb_obj_is_proc(trace)) {
 	rb_raise(rb_eTypeError, "trace_func needs to be Proc");
     }
-    trace_func = trace;
-    for (hook = event_hooks; hook; hook = hook->next) {
-	if (hook->func == call_trace_func)
-	    return trace;
-    }
-    rb_add_event_hook(call_trace_func, RUBY_EVENT_ALL);
-    return trace;
-}
-
-static char *
-get_event_name(rb_event_t event)
-{
-    switch (event) {
-    case RUBY_EVENT_LINE:
-	return "line";
-    case RUBY_EVENT_CLASS:
-	return "class";
-    case RUBY_EVENT_END:
-	return "end";
-    case RUBY_EVENT_CALL:
-	return "call";
-    case RUBY_EVENT_RETURN:
-	return "return";
-    case RUBY_EVENT_C_CALL:
-	return "c-call";
-    case RUBY_EVENT_C_RETURN:
-	return "c-return";
-    case RUBY_EVENT_RAISE:
-	return "raise";
-    default:
-	return "unknown";
-    }
+    return trace_func = trace;
 }
 
 static void
 call_trace_func(event, node, self, id, klass)
-    rb_event_t event;
+    char *event;
     NODE *node;
     VALUE self;
     ID id;
@@ -2663,7 +2449,6 @@ call_trace_func(event, node, self, id, klass)
     struct FRAME *prev;
     NODE *node_save;
     VALUE srcfile;
-    char *event_name;
 
     if (!trace_func) return;
     if (tracing) return;
@@ -2691,15 +2476,14 @@ call_trace_func(event, node, self, id, klass)
 	    klass = RBASIC(klass)->klass;
 	}
 	else if (FL_TEST(klass, FL_SINGLETON)) {
-	    klass = rb_iv_get(klass, "__attached__");
+	    klass = self;
 	}
     }
     PUSH_TAG(PROT_NONE);
     raised = thread_reset_raised();
     if ((state = EXEC_TAG()) == 0) {
 	srcfile = rb_str_new2(ruby_sourcefile?ruby_sourcefile:"(ruby)");
-	event_name = get_event_name(event);
-	proc_invoke(trace_func, rb_ary_new3(6, rb_str_new2(event_name),
+	proc_invoke(trace_func, rb_ary_new3(6, rb_str_new2(event),
 					    srcfile,
 					    INT2FIX(ruby_sourceline),
 					    id?ID2SYM(id):Qnil,
@@ -2757,7 +2541,7 @@ svalue_to_avalue(v)
     if (RARRAY(tmp)->len == 1) {
 	top = rb_check_array_type(RARRAY(tmp)->ptr[0]);
 	if (!NIL_P(top) && RARRAY(top)->len > 1) {
-	    return tmp;
+	    return v;
 	}
 	return rb_ary_new3(1, v);
     }
@@ -2871,24 +2655,6 @@ class_prefix(self, cpath)
 
 NORETURN(static void return_jump _((VALUE)));
 NORETURN(static void break_jump _((VALUE)));
-NORETURN(static void next_jump _((VALUE)));
-NORETURN(static void unknown_node _((NODE * volatile)));
-
-static void
-unknown_node(node)
-    NODE *volatile node;
-{
-    ruby_current_node = 0;
-    if (node->flags == 0) {
-        rb_bug("terminated node (0x%lx)", node);
-    }
-    else if (BUILTIN_TYPE(node) != T_NODE) {
-        rb_bug("not a node 0x%02lx (0x%lx)", BUILTIN_TYPE(node), node);
-    }
-    else {
-        rb_bug("unknown node type %d (0x%lx)", nd_type(node), node);
-    }
-}
 
 static VALUE
 rb_eval(self, n)
@@ -2998,9 +2764,11 @@ rb_eval(self, n)
 	RETURN(Qfalse);
 
       case NODE_IF:
-	EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self,
-			ruby_frame->last_func,
-			ruby_frame->last_class);
+	if (trace_func) {
+	    call_trace_func("line", node, self,
+			    ruby_frame->last_func,
+			    ruby_frame->last_class);
+	}
 	if (RTEST(rb_eval(self, node->nd_cond))) {
 	    node = node->nd_body;
 	}
@@ -3016,9 +2784,11 @@ rb_eval(self, n)
 	    if (nd_type(node) != NODE_WHEN) goto again;
 	    tag = node->nd_head;
 	    while (tag) {
-		EXEC_EVENT_HOOK(RUBY_EVENT_LINE, tag, self,
-				ruby_frame->last_func,
-				ruby_frame->last_class);
+		if (trace_func) {
+		    call_trace_func("line", tag, self,
+				    ruby_frame->last_func,
+				    ruby_frame->last_class);
+		}
 		if (tag->nd_head && nd_type(tag->nd_head) == NODE_WHEN) {
 		    VALUE v = rb_eval(self, tag->nd_head->nd_head);
 		    long i;
@@ -3057,9 +2827,11 @@ rb_eval(self, n)
 		}
 		tag = node->nd_head;
 		while (tag) {
-		    EXEC_EVENT_HOOK(RUBY_EVENT_LINE, tag, self,
-				    ruby_frame->last_func,
-				    ruby_frame->last_class);
+		    if (trace_func) {
+			call_trace_func("line", tag, self,
+					ruby_frame->last_func,
+					ruby_frame->last_class);
+		    }
 		    if (tag->nd_head && nd_type(tag->nd_head) == NODE_WHEN) {
 			VALUE v = rb_eval(self, tag->nd_head->nd_head);
 			long i;
@@ -3210,7 +2982,8 @@ rb_eval(self, n)
 
       case NODE_NEXT:
 	CHECK_INTS;
-	next_jump(rb_eval(self, node->nd_stts));
+	return_value(rb_eval(self, node->nd_stts));
+	JUMP_TAG(TAG_NEXT);
 	break;
 
       case NODE_REDO:
@@ -3292,6 +3065,7 @@ rb_eval(self, n)
 	    POP_TAG();
 	    if (state != TAG_RAISE) ruby_errinfo = e_info;
 	    if (state) {
+		if (state == TAG_NEXT) prot_tag->retval = result;
 		JUMP_TAG(state);
 	    }
 	    /* no exception raised */
@@ -3337,11 +3111,19 @@ rb_eval(self, n)
 
       case NODE_DOT2:
       case NODE_DOT3:
-        {
-	    VALUE beg = rb_eval(self, node->nd_beg);
-	    VALUE end = rb_eval(self, node->nd_end);
-	    result = rb_range_new(beg, end, nd_type(node) == NODE_DOT3);
-	}	
+	result = rb_range_new(rb_eval(self, node->nd_beg),
+			      rb_eval(self, node->nd_end),
+			      nd_type(node) == NODE_DOT3);
+	if (node->nd_state) break;
+	if (nd_type(node->nd_beg) == NODE_LIT && FIXNUM_P(node->nd_beg->nd_lit) &&
+	    nd_type(node->nd_end) == NODE_LIT && FIXNUM_P(node->nd_end->nd_lit))
+	{
+	    nd_set_type(node, NODE_LIT);
+	    node->nd_lit = result;
+	}
+	else {
+	    node->nd_state = 1;
+	}
 	break;
 
       case NODE_FLIP2:		/* like AWK */
@@ -3471,7 +3253,7 @@ rb_eval(self, n)
 	    TMP_PROTECT;
 
 	    if (ruby_frame->last_class == 0) {
-		if (ruby_frame->last_func) {
+		if (ruby_frame->orig_func) {
 		    rb_name_error(ruby_frame->last_func,
 				  "superclass method `%s' disabled",
 				  rb_id2name(ruby_frame->orig_func));
@@ -3482,17 +3264,7 @@ rb_eval(self, n)
 	    }
 	    if (nd_type(node) == NODE_ZSUPER) {
 		argc = ruby_frame->argc;
-		if (argc && DMETHOD_P()) {
-		    if (TYPE(RBASIC(ruby_scope)->klass) != T_ARRAY ||
-			RARRAY(RBASIC(ruby_scope)->klass)->len != argc) {
-			rb_raise(rb_eRuntimeError, 
-				 "super: specify arguments explicitly");
-		    }
-		    argv = RARRAY(RBASIC(ruby_scope)->klass)->ptr;
-		}
-		else {
-		    argv = ruby_scope->local_vars + 2;
-		}
+		argv = ruby_frame->argv;
 	    }
 	    else {
 		BEGIN_CALLARGS;
@@ -3547,29 +3319,28 @@ rb_eval(self, n)
       case NODE_OP_ASGN1:
 	{
 	    int argc; VALUE *argv; /* used in SETUP_ARGS */
-	    VALUE recv, val, tmp;
+	    VALUE recv, val;
 	    NODE *rval;
 	    TMP_PROTECT;
 
 	    recv = rb_eval(self, node->nd_recv);
 	    rval = node->nd_args->nd_head;
-	    SETUP_ARGS0(node->nd_args->nd_body, 1);
-	    val = rb_funcall3(recv, aref, argc, argv);
+	    SETUP_ARGS0(node->nd_args->nd_next, node->nd_args->nd_alen - 1);
+	    val = rb_funcall2(recv, aref, argc-1, argv);
 	    switch (node->nd_mid) {
 	    case 0: /* OR */
-	      if (RTEST(val)) RETURN(val);
-	      val = rb_eval(self, rval);
-	      break;
+		if (RTEST(val)) RETURN(val);
+		val = rb_eval(self, rval);
+		break;
 	    case 1: /* AND */
-	      if (!RTEST(val)) RETURN(val);
-	      val = rb_eval(self, rval);
-	      break;
+		if (!RTEST(val)) RETURN(val);
+		val = rb_eval(self, rval);
+		break;
 	    default:
-	      tmp = rb_eval(self, rval);
-	      val = rb_funcall3(val, node->nd_mid, 1, &tmp);
+		val = rb_funcall(val, node->nd_mid, 1, rb_eval(self, rval));
 	    }
-	    argv[argc] = val;
-	    rb_funcall2(recv, aset, argc+1, argv);
+	    argv[argc-1] = val;
+	    rb_funcall2(recv, aset, argc, argv);
 	    result = val;
 	}
 	break;
@@ -3577,22 +3348,22 @@ rb_eval(self, n)
       case NODE_OP_ASGN2:
 	{
 	    ID id = node->nd_next->nd_vid;
-	    VALUE recv, val, tmp;
+	    VALUE recv, val;
 
 	    recv = rb_eval(self, node->nd_recv);
-	    val = rb_funcall3(recv, id, 0, 0);
+	    val = rb_funcall(recv, id, 0);
 	    switch (node->nd_next->nd_mid) {
 	    case 0: /* OR */
-	      if (RTEST(val)) RETURN(val);
-	      val = rb_eval(self, node->nd_value);
-	      break;
+		if (RTEST(val)) RETURN(val);
+		val = rb_eval(self, node->nd_value);
+		break;
 	    case 1: /* AND */
-	      if (!RTEST(val)) RETURN(val);
-	      val = rb_eval(self, node->nd_value);
-	      break;
+		if (!RTEST(val)) RETURN(val);
+		val = rb_eval(self, node->nd_value);
+		break;
 	    default:
-	      tmp = rb_eval(self, node->nd_value);
-	      val = rb_funcall3(val, node->nd_next->nd_mid, 1, &tmp);
+		val = rb_funcall(val, node->nd_next->nd_mid, 1,
+				 rb_eval(self, node->nd_value));
 	    }
 
 	    rb_funcall2(recv, node->nd_next->nd_aid, 1, &val);
@@ -3651,6 +3422,9 @@ rb_eval(self, n)
 	    rb_const_set(class_prefix(self, node->nd_else), node->nd_else->nd_mid, result);
 	}
 	else {
+	    if (NIL_P(ruby_cbase)) {
+		rb_raise(rb_eTypeError, "no class/module to define constant");
+	    }
 	    rb_const_set(ruby_cbase, node->nd_vid, result);
 	}
 	break;
@@ -3865,6 +3639,13 @@ rb_eval(self, n)
 	result = node->nd_lit;
 	break;
 
+      case NODE_ATTRSET:
+	if (ruby_frame->argc != 1)
+	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)",
+		     ruby_frame->argc);
+	result = rb_ivar_set(self, node->nd_vid, ruby_frame->argv[0]);
+	break;
+
       case NODE_DEFN:
 	if (node->nd_defn) {
 	    NODE *body,  *defn;
@@ -3949,7 +3730,7 @@ rb_eval(self, n)
 	if (NIL_P(ruby_class)) {
 	    rb_raise(rb_eTypeError, "no class to undef method");
 	}
-	rb_undef(ruby_class, rb_to_id(rb_eval(self, node->u2.node)));
+	rb_undef(ruby_class, node->nd_mid);
 	result = Qnil;
 	break;
 
@@ -3957,13 +3738,12 @@ rb_eval(self, n)
 	if (NIL_P(ruby_class)) {
 	    rb_raise(rb_eTypeError, "no class to make alias");
 	}
-	rb_alias(ruby_class, rb_to_id(rb_eval(self, node->u1.node)),
-		             rb_to_id(rb_eval(self, node->u2.node)));
+	rb_alias(ruby_class, node->nd_new, node->nd_old);
 	result = Qnil;
 	break;
 
       case NODE_VALIAS:
-	rb_alias_variable(node->u1.id, node->u2.id);
+	rb_alias_variable(node->nd_new, node->nd_old);
 	result = Qnil;
 	break;
 
@@ -4090,14 +3870,16 @@ rb_eval(self, n)
 	break;
 
       case NODE_NEWLINE:
-	EXEC_EVENT_HOOK(RUBY_EVENT_LINE, node, self, 
-			ruby_frame->last_func,
-			ruby_frame->last_class);
+	if (trace_func) {
+	    call_trace_func("line", node, self,
+			    ruby_frame->last_func,
+			    ruby_frame->last_class);
+	}
 	node = node->nd_next;
 	goto again;
 
       default:
-	unknown_node(node);
+	rb_bug("unknown node type %d", nd_type(node));
     }
   finish:
     CHECK_INTS;
@@ -4143,8 +3925,9 @@ module_setup(module, n)
     PUSH_CREF(module);
     PUSH_TAG(PROT_NONE);
     if ((state = EXEC_TAG()) == 0) {
-	EXEC_EVENT_HOOK(RUBY_EVENT_CLASS, n, ruby_cbase,
-			ruby_frame->last_func, ruby_frame->last_class);
+	if (trace_func) {
+	    call_trace_func("class", n, ruby_cbase, ruby_frame->last_func, ruby_frame->last_class);
+	}
 	result = rb_eval(ruby_cbase, node->nd_next);
     }
     POP_TAG();
@@ -4154,41 +3937,23 @@ module_setup(module, n)
     POP_CLASS();
 
     ruby_frame = frame.tmp;
-    EXEC_EVENT_HOOK(RUBY_EVENT_END, n, 0,
-		    ruby_frame->last_func, ruby_frame->last_class);
+    if (trace_func) {
+	call_trace_func("end", n, 0, ruby_frame->last_func, ruby_frame->last_class);
+    }
     if (state) JUMP_TAG(state);
 
     return result;
 }
 
-static NODE *basic_respond_to = 0;
-
-int
-rb_obj_respond_to(obj, id, priv)
-    VALUE obj;
-    ID id;
-    int priv;
-{
-    VALUE klass = CLASS_OF(obj);
-
-    if (rb_method_node(klass, respond_to) == basic_respond_to) {
-	return rb_method_boundp(klass, id, !priv);
-    }
-    else {
-	VALUE args[2];
-	int n = 0;
-	args[n++] = ID2SYM(id);
-	if (priv) args[n++] = Qtrue;
-	return rb_funcall2(obj, respond_to, n, args);
-    }
-}
-
 int
 rb_respond_to(obj, id)
     VALUE obj;
     ID id;
 {
-    return rb_obj_respond_to(obj, id, Qfalse);
+    if (rb_method_boundp(CLASS_OF(obj), id, 0)) {
+	return Qtrue;
+    }
+    return Qfalse;
 }
 
 /*
@@ -4201,7 +3966,7 @@ rb_respond_to(obj, id)
  */
 
 static VALUE
-obj_respond_to(argc, argv, obj)
+rb_obj_respond_to(argc, argv, obj)
     int argc;
     VALUE *argv;
     VALUE obj;
@@ -4372,15 +4137,16 @@ rb_mod_protected_method_defined(mod, mid)
     return Qfalse;
 }
 
-NORETURN(static VALUE terminate_process _((int, VALUE)));
+NORETURN(static VALUE terminate_process _((int, const char *, long)));
 static VALUE
-terminate_process(status, mesg)
+terminate_process(status, mesg, mlen)
     int status;
-    VALUE mesg;
+    const char *mesg;
+    long mlen;
 {
     VALUE args[2];
     args[0] = INT2NUM(status);
-    args[1] = mesg;
+    args[1] = rb_str_new(mesg, mlen);
 
     rb_exc_raise(rb_class_new_instance(2, args, rb_eSystemExit));
 }
@@ -4390,7 +4156,7 @@ rb_exit(status)
     int status;
 {
     if (prot_tag) {
-	terminate_process(status, rb_str_new("exit", 4));
+	terminate_process(status, "exit", 4);
     }
     ruby_finalize();
     exit(status);
@@ -4454,9 +4220,6 @@ rb_f_exit(argc, argv)
 	    break;
 	  default:
 	    istatus = NUM2INT(status);
-#if EXIT_SUCCESS != 0
-	    if (istatus == 0) istatus = EXIT_SUCCESS;
-#endif
 	    break;
 	}
     }
@@ -4495,9 +4258,9 @@ rb_f_abort(argc, argv)
 	VALUE mesg;
 
 	rb_scan_args(argc, argv, "1", &mesg);
-	StringValue(mesg);
-	rb_io_puts(1, &mesg, rb_stderr);
-	terminate_process(EXIT_FAILURE, mesg);
+	StringValue(argv[0]);
+	rb_io_puts(argc, argv, rb_stderr);
+	terminate_process(EXIT_FAILURE, RSTRING(argv[0])->ptr, RSTRING(argv[0])->len);
     }
     return Qnil;		/* not reached */
 }
@@ -4563,8 +4326,8 @@ rb_longjmp(tag, mesg)
     }
 
     rb_trap_restore_mask();
-    if (tag != TAG_FATAL) {
-	EXEC_EVENT_HOOK(RUBY_EVENT_RAISE, ruby_current_node,
+    if (trace_func && tag != TAG_FATAL) {
+	call_trace_func("raise", ruby_current_node,
 			ruby_frame->self,
 			ruby_frame->last_func,
 			ruby_frame->last_class);
@@ -4813,9 +4576,6 @@ break_jump(retval)
 	    tt->retval = retval;
 	    JUMP_TAG(TAG_BREAK);
 	    break;
-	  case PROT_FUNC:
-	    tt = 0;
-	    continue;
 	  default:
 	    break;
 	}
@@ -4824,40 +4584,6 @@ break_jump(retval)
     localjump_error("unexpected break", retval, TAG_BREAK);
 }
 
-static void
-next_jump(retval)
-    VALUE retval;
-{
-    struct tag *tt = prot_tag;
-
-    if (retval == Qundef) retval = Qnil;
-    while (tt) {
-	switch (tt->tag) {
-	  case PROT_THREAD:
-	  case PROT_YIELD:
-	  case PROT_LOOP:
-	  case PROT_LAMBDA:
-	  case PROT_FUNC:
-	    tt->dst = (VALUE)tt->frame->uniq;
-	    tt->retval = retval;
-	    JUMP_TAG(TAG_NEXT);
-	    break;
-	  default:
-	    break;
-	}
-	tt = tt->prev;
-    }
-    localjump_error("unexpected next", retval, TAG_NEXT);
-}
-
-void
-rb_need_block()
-{
-    if (!rb_block_given_p()) {
-	localjump_error("no block given", Qnil, 0);
-    }
-}
-
 static VALUE
 rb_yield_0(val, self, klass, flags, avalue)
     VALUE val, self, klass;	/* OK */
@@ -4875,13 +4601,14 @@ rb_yield_0(val, self, klass, flags, avalue)
     int lambda = flags & YIELD_LAMBDA_CALL;
     int state;
 
-    rb_need_block();
+    if (!rb_block_given_p()) {
+	localjump_error("no block given", Qnil, 0);
+    }
 
     PUSH_VARS();
     block = ruby_block;
     frame = block->frame;
     frame.prev = ruby_frame;
-    frame.node = cnode;
     ruby_frame = &(frame);
     old_cref = (VALUE)ruby_cref;
     ruby_cref = block->cref;
@@ -4994,10 +4721,8 @@ rb_yield_0(val, self, klass, flags, avalue)
 	    CHECK_INTS;
 	    goto redo;
 	  case TAG_NEXT:
-	    if (!lambda) {
-		state = 0;
-		result = prot_tag->retval;
-	    }
+	    state = 0;
+	    result = prot_tag->retval;
 	    break;
 	  case TAG_BREAK:
 	    if (TAG_DST()) {
@@ -5359,23 +5084,17 @@ rb_rescue2(b_proc, data1, r_proc, data2, va_alist)
     int state;
     volatile VALUE result;
     volatile VALUE e_info = ruby_errinfo;
-    volatile int handle = Qfalse;
-    VALUE eclass;
     va_list args;
 
     PUSH_TAG(PROT_NONE);
-    switch (state = EXEC_TAG()) {
-      case TAG_RETRY:
-	if (!handle) break;
-	handle = Qfalse;
-	state = 0;
-	ruby_errinfo = Qnil;
-      case 0:
+    if ((state = EXEC_TAG()) == 0) {
+      retry_entry:
 	result = (*b_proc)(data1);
-	break;
-      case TAG_RAISE:
-	if (handle) break;
-	handle = Qfalse;
+    }
+    else if (state == TAG_RAISE) {
+	int handle = Qfalse;
+	VALUE eclass;
+
 	va_init_list(args, data2);
 	while (eclass = va_arg(args, VALUE)) {
 	    if (rb_obj_is_kind_of(ruby_errinfo, eclass)) {
@@ -5386,14 +5105,25 @@ rb_rescue2(b_proc, data1, r_proc, data2, va_alist)
 	va_end(args);
 
 	if (handle) {
-	    state = 0;
 	    if (r_proc) {
-		result = (*r_proc)(data2, ruby_errinfo);
+		PUSH_TAG(PROT_NONE);
+		if ((state = EXEC_TAG()) == 0) {
+		    result = (*r_proc)(data2, ruby_errinfo);
+		}
+		POP_TAG();
+		if (state == TAG_RETRY) {
+		    state = 0;
+		    ruby_errinfo = Qnil;
+		    goto retry_entry;
+		}
 	    }
 	    else {
 		result = Qnil;
+		state = 0;
+	    }
+	    if (state == 0) {
+		ruby_errinfo = e_info;
 	    }
-	    ruby_errinfo = e_info;
 	}
     }
     POP_TAG();
@@ -5410,8 +5140,6 @@ rb_rescue(b_proc, data1, r_proc, data2)
     return rb_rescue2(b_proc, data1, r_proc, data2, rb_eStandardError, (VALUE)0);
 }
 
-static VALUE cont_protect;
-
 VALUE
 rb_protect(proc, data, state)
     VALUE (*proc) _((VALUE));
@@ -5422,11 +5150,9 @@ rb_protect(proc, data, state)
     int status;
 
     PUSH_TAG(PROT_NONE);
-    cont_protect = (VALUE)rb_node_newnode(NODE_MEMO, cont_protect, 0, 0);
     if ((status = EXEC_TAG()) == 0) {
 	result = (*proc)(data);
     }
-    cont_protect = ((NODE *)cont_protect)->u1.value;
     POP_TAG();
     if (state) {
 	*state = status;
@@ -5487,7 +5213,7 @@ rb_with_disable_interrupt(proc, data)
     return result;
 }
 
-static void
+static inline void
 stack_check()
 {
     static int overflowing = 0;
@@ -5615,23 +5341,13 @@ method_missing(obj, id, argc, argv, call_status)
 	POP_FRAME();
     }
     else if (id == ID_ALLOCATOR) {
-	rb_raise(rb_eTypeError, "allocator undefined for %s", rb_class2name(obj));
+	rb_raise(rb_eNoMethodError, "allocator undefined for %s", rb_class2name(obj));
     }
-    if (argc < 0) {
-	VALUE tmp;
 
-	argc = -argc-1;
-	tmp = splat_value(argv[argc]);
-	nargv = ALLOCA_N(VALUE, argc + RARRAY(tmp)->len + 1);
-	MEMCPY(nargv+1, argv, VALUE, argc);
-	MEMCPY(nargv+1+argc, RARRAY(tmp)->ptr, VALUE, RARRAY(tmp)->len);
-	argc += RARRAY(tmp)->len;
-    }
-    else {
-	nargv = ALLOCA_N(VALUE, argc+1);
-	MEMCPY(nargv+1, argv, VALUE, argc);
-    }
+    nargv = ALLOCA_N(VALUE, argc+1);
     nargv[0] = ID2SYM(id);
+    MEMCPY(nargv+1, argv, VALUE, argc);
+
     return rb_funcall2(obj, missing, argc+1, nargv);
 }
 
@@ -5717,37 +5433,30 @@ call_cfunc(func, recv, len, argc, argv)
 		       argv[11], argv[12], argv[13], argv[14]);
 	break;
       default:
-	rb_raise(rb_eArgError, "too many arguments (%d)", len);
+	rb_raise(rb_eArgError, "too many arguments(%d)", len);
 	break;
     }
     return Qnil;		/* not reached */
 }
 
 static VALUE
-rb_call0(klass, recv, id, oid, argc, argv, body, flags)
+rb_call0(klass, recv, id, oid, argc, argv, body, nosuper)
     VALUE klass, recv;
     ID    id;
     ID    oid;
     int argc;			/* OK */
     VALUE *argv;		/* OK */
-    NODE * volatile body;
-    int flags;
+    NODE *body;			/* OK */
+    int nosuper;
 {
     NODE *b2;		/* OK */
     volatile VALUE result = Qnil;
     int itr;
     static int tick;
     TMP_PROTECT;
-    volatile int safe = -1;
 
-    if (NOEX_SAFE(flags) > ruby_safe_level &&
-	!(flags&NOEX_TAINTED) && ruby_safe_level == 0 && NOEX_SAFE(flags) > 2) {
-	rb_raise(rb_eSecurityError, "calling insecure method: %s",
-		 rb_id2name(id));
-    }
     switch (ruby_iter->iter) {
       case ITER_PRE:
-      case ITER_PAS:
 	itr = ITER_CUR;
 	break;
       case ITER_CUR:
@@ -5761,27 +5470,15 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 	stack_check();
 	rb_gc_finalize_deferred();
     }
-    if (argc < 0) {
-	VALUE tmp;
-	VALUE *nargv;
-
-	argc = -argc-1;
-	tmp = splat_value(argv[argc]);
-	nargv = TMP_ALLOC(argc + RARRAY(tmp)->len);
-	MEMCPY(nargv, argv, VALUE, argc);
-	MEMCPY(nargv+argc, RARRAY(tmp)->ptr, VALUE, RARRAY(tmp)->len);
-	argc += RARRAY(tmp)->len;
-	argv = nargv;
-    }
     PUSH_ITER(itr);
     PUSH_FRAME();
 
     ruby_frame->last_func = id;
     ruby_frame->orig_func = oid;
-    ruby_frame->last_class = (flags & NOEX_NOSUPER)?0:klass;
+    ruby_frame->last_class = nosuper?0:klass;
     ruby_frame->self = recv;
     ruby_frame->argc = argc;
-    ruby_frame->flags = 0;
+    ruby_frame->argv = argv;
 
     switch (nd_type(body)) {
       case NODE_CFUNC:
@@ -5789,22 +5486,20 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 	    int len = body->nd_argc;
 
 	    if (len < -2) {
-		rb_bug("bad argc (%d) specified for `%s(%s)'",
+		rb_bug("bad argc(%d) specified for `%s(%s)'",
 		       len, rb_class2name(klass), rb_id2name(id));
 	    }
-	    if (event_hooks) {
+	    if (trace_func) {
 		int state;
 
-		EXEC_EVENT_HOOK(RUBY_EVENT_C_CALL, ruby_current_node,
-				recv, id, klass);
+		call_trace_func("c-call", ruby_current_node, recv, id, klass);
 		PUSH_TAG(PROT_FUNC);
 		if ((state = EXEC_TAG()) == 0) {
 		    result = call_cfunc(body->nd_cfnc, recv, len, argc, argv);
 		}
 		POP_TAG();
 		ruby_current_node = ruby_frame->node;
-		EXEC_EVENT_HOOK(RUBY_EVENT_C_RETURN, ruby_current_node,
-				recv, id, klass);
+		call_trace_func("c-return", ruby_current_node, recv, id, klass);
 		if (state) JUMP_TAG(state);
 	    }
 	    else {
@@ -5822,13 +5517,9 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 	break;
 
       case NODE_ATTRSET:
-	if (argc != 1)
-	    rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
-	result = rb_ivar_set(recv, body->nd_vid, argv[0]);
-	break;
-
+	/* for re-scoped/renamed method */
       case NODE_ZSUPER:
-	result = rb_call_super(argc, argv);
+	result = rb_eval(recv, body);
 	break;
 
       case NODE_DMETHOD:
@@ -5836,16 +5527,7 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 	break;
 
       case NODE_BMETHOD:
-	ruby_frame->flags |= FRAME_DMETH;
-	if (event_hooks) {
-	    struct BLOCK *data;
-	    Data_Get_Struct(body->nd_cval, struct BLOCK, data);
-	    EXEC_EVENT_HOOK(RUBY_EVENT_CALL, data->body, recv, id, klass);
-	}
 	result = proc_invoke(body->nd_cval, rb_ary_new4(argc, argv), recv, klass);
-	if (event_hooks) {
-	    EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, body, recv, id, klass);
-	}
 	break;
 
       case NODE_SCOPE:
@@ -5855,6 +5537,7 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 	    NODE *saved_cref = 0;
 
 	    PUSH_SCOPE();
+
 	    if (body->nd_rval) {
 		saved_cref = ruby_cref;
 		ruby_cref = (NODE*)body->nd_rval;
@@ -5873,15 +5556,12 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 	    }
 	    b2 = body = body->nd_next;
 
-	    if (NOEX_SAFE(flags) > ruby_safe_level) {
-		safe = ruby_safe_level;
-		ruby_safe_level = NOEX_SAFE(flags);
-	    }
 	    PUSH_VARS();
 	    PUSH_TAG(PROT_FUNC);
+
 	    if ((state = EXEC_TAG()) == 0) {
 		NODE *node = 0;
-		int i, nopt = 0;
+		int i;
 
 		if (nd_type(body) == NODE_ARGS) {
 		    node = body;
@@ -5901,56 +5581,55 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 			rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
 				 argc, i);
 		    }
-		    if (!node->nd_rest) {
+		    if ((long)node->nd_rest == -1) {
+			int opt = i;
 			NODE *optnode = node->nd_opt;
 
-			nopt = i;
 			while (optnode) {
-			    nopt++;
+			    opt++;
 			    optnode = optnode->nd_next;
 			}
-			if (nopt < argc) {
-			    rb_raise(rb_eArgError,
-				     "wrong number of arguments (%d for %d)",
-				     argc, nopt);
+			if (opt < argc) {
+			    rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)",
+				     argc, opt);
 			}
+			ruby_frame->argc = opt;
+			ruby_frame->argv = local_vars+2;
 		    }
+
 		    if (local_vars) {
 			if (i > 0) {
 			    /* +2 for $_ and $~ */
 			    MEMCPY(local_vars+2, argv, VALUE, i);
 			}
-		    }
-		    argv += i; argc -= i;
-		    if (node->nd_opt) {
-			NODE *opt = node->nd_opt;
-
-			while (opt && argc) {
-			    assign(recv, opt->nd_head, *argv, 1);
-			    argv++; argc--;
-			    opt = opt->nd_next;
-			}
-			if (opt) {
-			    rb_eval(recv, opt);
-			}
-			i = nopt;
-		    }
-		    if (node->nd_rest) {
-			VALUE v;
-			
-			if (argc > 0) {
-			    v = rb_ary_new4(argc,argv);
-			    i = -i - 1;
+			argv += i; argc -= i;
+			if (node->nd_opt) {
+			    NODE *opt = node->nd_opt;
+
+			    while (opt && argc) {
+				assign(recv, opt->nd_head, *argv, 1);
+				argv++; argc--;
+				opt = opt->nd_next;
+			    }
+			    if (opt) {
+				rb_eval(recv, opt);
+			    }
 			}
-			else {
-			    v = rb_ary_new2(0);
+			local_vars = ruby_scope->local_vars;
+			if ((long)node->nd_rest >= 0) {
+			    VALUE v;
+
+			    if (argc > 0)
+				v = rb_ary_new4(argc,argv);
+			    else
+				v = rb_ary_new2(0);
+			    ruby_scope->local_vars[node->nd_rest] = v;
 			}
-			assign(recv, node->nd_rest, v, 1);
 		    }
-		    ruby_frame->argc = i;
 		}
-		if (event_hooks) {
-		    EXEC_EVENT_HOOK(RUBY_EVENT_CALL, b2, recv, id, klass);
+
+		if (trace_func) {
+		    call_trace_func("call", b2, recv, id, klass);
 		}
 		result = rb_eval(recv, body);
 	    }
@@ -5959,14 +5638,13 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 		state = 0;
 	    }
 	    POP_TAG();
-	    if (event_hooks) {
-		EXEC_EVENT_HOOK(RUBY_EVENT_RETURN, body, recv, id, klass);
-	    }
 	    POP_VARS();
 	    POP_CLASS();
 	    POP_SCOPE();
 	    ruby_cref = saved_cref;
-	    if (safe >= 0) ruby_safe_level = safe;
+	    if (trace_func) {
+		call_trace_func("return", ruby_frame->prev->node, recv, id, klass);
+	    }
 	    switch (state) {
 	      case 0:
 		break;
@@ -5987,7 +5665,7 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
 	break;
 
       default:
-	unknown_node(body);
+	rb_bug("unknown node type %d", nd_type(body));
 	break;
     }
     POP_FRAME();
@@ -6029,13 +5707,13 @@ rb_call(klass, recv, mid, argc, argv, scope)
 	return method_missing(recv, mid, argc, argv, scope==2?CSTAT_VCALL:0);
     }
 
-    if (mid != missing && scope == 0) {
+    if (mid != missing) {
 	/* receiver specified form for private method */
-	if (noex & NOEX_PRIVATE)
+	if ((noex & NOEX_PRIVATE) && scope == 0)
 	    return method_missing(recv, mid, argc, argv, CSTAT_PRIV);
 
 	/* self must be kind of a specified form for protected method */
-	if (noex & NOEX_PROTECTED) {
+	if ((noex & NOEX_PROTECTED)) {
 	    VALUE defined_class = klass;
 
 	    if (TYPE(defined_class) == T_ICLASS) {
@@ -6046,7 +5724,7 @@ rb_call(klass, recv, mid, argc, argv, scope)
 	}
     }
 
-    return rb_call0(klass, recv, mid, id, argc, argv, body, noex);
+    return rb_call0(klass, recv, mid, id, argc, argv, body, noex & NOEX_NOSUPER);
 }
 
 VALUE
@@ -6070,7 +5748,7 @@ rb_apply(recv, mid, args)
  *     obj.__send__(symbol [, args...])    => obj
  *  
  *  Invokes the method identified by _symbol_, passing it any
- *  arguments specified. You can use <code>\_\_send__</code> if the name
+ *  arguments specified. You can use <code>__send__</code> if the name
  *  +send+ clashes with an existing method in _obj_.
  *     
  *     class Klass
@@ -6100,13 +5778,18 @@ rb_f_send(argc, argv, recv)
     return vid;
 }
 
-static VALUE
-vafuncall(recv, mid, n, ar)
+VALUE
+#ifdef HAVE_STDARG_PROTOTYPES
+rb_funcall(VALUE recv, ID mid, int n, ...)
+#else
+rb_funcall(recv, mid, n, va_alist)
     VALUE recv;
     ID mid;
     int n;
-    va_list *ar;
+    va_dcl
+#endif
 {
+    va_list ar;
     VALUE *argv;
 
     if (n > 0) {
@@ -6114,10 +5797,11 @@ vafuncall(recv, mid, n, ar)
 
 	argv = ALLOCA_N(VALUE, n);
 
+	va_init_list(ar, n);
 	for (i=0;i<n;i++) {
-	    argv[i] = va_arg(*ar, VALUE);
+	    argv[i] = va_arg(ar, VALUE);
 	}
-	va_end(*ar);
+	va_end(ar);
     }
     else {
 	argv = 0;
@@ -6127,55 +5811,6 @@ vafuncall(recv, mid, n, ar)
 }
 
 VALUE
-#ifdef HAVE_STDARG_PROTOTYPES
-rb_funcall(VALUE recv, ID mid, int n, ...)
-#else
-rb_funcall(recv, mid, n, va_alist)
-    VALUE recv;
-    ID mid;
-    int n;
-    va_dcl
-#endif
-{
-    va_list ar;
-    va_init_list(ar, n);
-
-    return vafuncall(recv, mid, n, &ar);
-}
-
-VALUE
-#ifdef HAVE_STDARG_PROTOTYPES
-rb_funcall_rescue(VALUE recv, ID mid, int n, ...)
-#else
-rb_funcall_rescue(recv, mid, n, va_alist)
-    VALUE recv;
-    ID mid;
-    int n;
-    va_dcl
-#endif
-{
-    VALUE result = Qnil;	/* OK */
-    int status;
-    va_list ar;
-
-    va_init_list(ar, n);
-
-    PUSH_TAG(PROT_NONE);
-    if ((status = EXEC_TAG()) == 0) {
-	result = vafuncall(recv, mid, n, &ar);
-    }
-    POP_TAG();
-    switch (status) {
-      case 0:
-	return result;
-      case TAG_RAISE:
-	return Qundef;
-      default:
-	JUMP_TAG(status);
-    }
-}
-
-VALUE
 rb_funcall2(recv, mid, argc, argv)
     VALUE recv;
     ID mid;
@@ -6200,18 +5835,15 @@ rb_call_super(argc, argv)
     int argc;
     const VALUE *argv;
 {
-    VALUE result, self, klass;
+    VALUE result, self, klass, k;
 
     if (ruby_frame->last_class == 0) {
 	rb_name_error(ruby_frame->last_func, "calling `super' from `%s' is prohibited",
-		      rb_id2name(ruby_frame->orig_func));
+		      rb_id2name(ruby_frame->last_func));
     }
 
     self = ruby_frame->self;
     klass = ruby_frame->last_class;
-    if (RCLASS(klass)->super == 0) {
-	return method_missing(self, ruby_frame->orig_func, argc, argv, CSTAT_SUPER);
-    }
 
     PUSH_ITER(ruby_iter->iter ? ITER_PRE : ITER_NOT);
     result = rb_call(RCLASS(klass)->super, self, ruby_frame->orig_func, argc, argv, 3);
@@ -6258,11 +5890,8 @@ backtrace(lev)
 	    }
 	}
     }
-    for (; frame && (n = frame->node); frame = frame->prev) {
+    while (frame && (n = frame->node)) {
 	if (frame->prev && frame->prev->last_func) {
-	    if (frame->prev->node == n) {
-		if (frame->prev->last_func == frame->last_func) continue;
-	    }
 	    snprintf(buf, BUFSIZ, "%s:%d:in `%s'",
 		     n->nd_file, nd_line(n),
 		     rb_id2name(frame->prev->last_func));
@@ -6271,6 +5900,7 @@ backtrace(lev)
 	    snprintf(buf, BUFSIZ, "%s:%d", n->nd_file, nd_line(n));
 	}
 	rb_ary_push(ary, rb_str_new2(buf));
+	frame = frame->prev;
     }
 
     return ary;
@@ -6313,7 +5943,7 @@ rb_f_caller(argc, argv)
 
     if (NIL_P(level)) lev = 1;
     else lev = NUM2INT(level);
-    if (lev < 0) rb_raise(rb_eArgError, "negative level (%d)", lev);
+    if (lev < 0) rb_raise(rb_eArgError, "negative level(%d)", lev);
 
     return backtrace(lev);
 }
@@ -6424,7 +6054,7 @@ eval(self, src, scope, file, line)
 	file = ruby_sourcefile;
 	line = ruby_sourceline;
     }
-    PUSH_CLASS(data ? data->klass : ruby_class);
+    PUSH_CLASS(ruby_cbase);
     ruby_in_eval++;
     if (TYPE(ruby_class) == T_ICLASS) {
 	ruby_class = RBASIC(ruby_class)->klass;
@@ -6447,6 +6077,7 @@ eval(self, src, scope, file, line)
     POP_TAG();
     POP_CLASS();
     ruby_in_eval--;
+    ruby_safe_level = safe;
     if (!NIL_P(scope)) {
 	int dont_recycle = ruby_scope->flags & SCOPE_DONT_RECYCLE;
 
@@ -6572,15 +6203,14 @@ exec_under(func, under, cbase, args)
     VALUE val = Qnil;		/* OK */
     int state;
     int mode;
-    struct FRAME *f = ruby_frame;
 
     PUSH_CLASS(under);
     PUSH_FRAME();
-    ruby_frame->self = f->self;
-    ruby_frame->last_func = f->last_func;
-    ruby_frame->orig_func = f->orig_func;
-    ruby_frame->last_class = f->last_class;
-    ruby_frame->argc = f->argc;
+    ruby_frame->self = _frame.prev->self;
+    ruby_frame->last_func = _frame.prev->last_func;
+    ruby_frame->last_class = _frame.prev->last_class;
+    ruby_frame->argc = _frame.prev->argc;
+    ruby_frame->argv = _frame.prev->argv;
     if (cbase) {
 	PUSH_CREF(cbase);
     }
@@ -6605,11 +6235,6 @@ static VALUE
 eval_under_i(args)
     VALUE *args;
 {
-    struct FRAME *f = ruby_frame;
-
-    if (f && (f = f->prev) && (f = f->prev)) {
-	ruby_frame = f;
-    }
     return eval(args[0], args[1], Qnil, (char*)args[2], (int)args[3]);
 }
 
@@ -6721,7 +6346,7 @@ rb_obj_instance_eval(argc, argv, self)
 {
     VALUE klass;
 
-    if (SPECIAL_CONST_P(self)) {
+    if (FIXNUM_P(self) || SYMBOL_P(self)) {
 	klass = Qnil;
     }
     else {
@@ -7003,19 +6628,19 @@ rb_provide(feature)
     rb_provide_feature(rb_str_new2(feature));
 }
 
-static int
+static void
 load_wait(ftptr)
     char *ftptr;
 {
     st_data_t th;
 
-    if (!loading_tbl) return Qfalse;
-    if (!st_lookup(loading_tbl, (st_data_t)ftptr, &th)) return Qfalse;
+    if (!loading_tbl) return;
+    if (!st_lookup(loading_tbl, (st_data_t)ftptr, &th)) return;
+    if ((rb_thread_t)th == curr_thread) return;
     do {
-	if ((rb_thread_t)th == curr_thread) return Qtrue;
 	CHECK_INTS;
+	rb_thread_schedule();
     } while (st_lookup(loading_tbl, (st_data_t)ftptr, &th));
-    return Qtrue;
 }
 
 /*
@@ -7110,7 +6735,7 @@ static void
 load_failed(fname)
     VALUE fname;
 {
-    rb_raise(rb_eLoadError, "no such file to load -- %s", RSTRING(fname)->ptr);
+    rb_raise(rb_eLoadError, "No such file to load -- %s", RSTRING(fname)->ptr);
 }
 
 VALUE
@@ -7146,11 +6771,13 @@ rb_require_safe(fname, safe)
 	ruby_safe_level = safe;
 	found = search_required(fname, &feature, &path);
 	if (found) {
-	    if (!path || load_wait(RSTRING(feature)->ptr)) {
+	    if (!path) {
+		load_wait(RSTRING(feature)->ptr);
 		result = Qfalse;
 	    }
 	    else {
 		ruby_safe_level = 0;
+		rb_provide_feature(feature);
 		switch (found) {
 		  case 'r':
 		    /* loading ruby library should be serialized. */
@@ -7173,7 +6800,6 @@ rb_require_safe(fname, safe)
 		    rb_ary_push(ruby_dln_librefs, LONG2NUM(handle));
 		    break;
 		}
-		rb_provide_feature(feature);
 		result = Qtrue;
 	    }
 	}
@@ -7909,11 +7535,8 @@ Init_eval()
     rb_define_global_function("method_missing", rb_method_missing, -1);
     rb_define_global_function("loop", rb_f_loop, 0);
 
-    rb_define_method(rb_mKernel, "respond_to?", obj_respond_to, -1);
-    respond_to   = rb_intern("respond_to?");
-    rb_global_variable((VALUE*)&basic_respond_to);
-    basic_respond_to = rb_method_node(rb_cObject, respond_to);
-    
+    rb_define_method(rb_mKernel, "respond_to?", rb_obj_respond_to, -1);
+
     rb_define_global_function("raise", rb_f_raise, -1);
     rb_define_global_function("fail", rb_f_raise, -1);
 
@@ -7977,11 +7600,11 @@ Init_eval()
 /*
  *  call-seq:
  *     mod.autoload(name, filename)   => nil
- *
+ *  
  *  Registers _filename_ to be loaded (using <code>Kernel::require</code>) 
- *  the first time that _name_ (which may be a <code>String</code> or
+ *  the first time that _module_ (which may be a <code>String</code> or
  *  a symbol) is accessed in the namespace of _mod_.
- *
+ *     
  *     module A
  *     end
  *     A.autoload(:B, "b")
@@ -8002,16 +7625,7 @@ rb_mod_autoload(mod, sym, file)
 }
 
 /*
- *  call-seq:
- *     mod.autoload?(name)   => String or nil
- *
- *  Returns _filename_ to be loaded if _name_ is registered as
- *  +autoload+ in the namespace of _mod_.
- *
- *     module A
- *     end
- *     A.autoload(:B, "b")
- *     A.autoload?(:B)            # => "b"
+ * MISSING: documentation
  */
 
 static VALUE
@@ -8038,21 +7652,12 @@ rb_f_autoload(obj, sym, file)
     VALUE sym;
     VALUE file;
 {
-    if (NIL_P(ruby_cbase)) {
-	rb_raise(rb_eTypeError, "no class/module for autoload target");
-    }
     return rb_mod_autoload(ruby_cbase, sym, file);
 }
 
+
 /*
- *  call-seq:
- *     autoload(module, filename)   => nil
- *
- *  Registers _filename_ to be loaded (using <code>Kernel::require</code>)
- *  the first time that _module_ (which may be a <code>String</code> or
- *  a symbol) is accessed.
- *
- *     autoload(:MyModule, "/usr/local/lib/modules/my_module.rb")
+ * MISSING: documentation
  */
 
 static VALUE
@@ -8061,23 +7666,20 @@ rb_f_autoload_p(obj, sym)
     VALUE sym;
 {
     /* use ruby_cbase as same as rb_f_autoload. */
-    if (NIL_P(ruby_cbase)) {
-	return Qfalse;
-    }
     return rb_mod_autoload_p(ruby_cbase, sym);
 }
 
 void
 Init_load()
 {
+    rb_load_path = rb_ary_new();
     rb_define_readonly_variable("$:", &rb_load_path);
     rb_define_readonly_variable("$-I", &rb_load_path);
     rb_define_readonly_variable("$LOAD_PATH", &rb_load_path);
-    rb_load_path = rb_ary_new();
 
+    rb_features = rb_ary_new();
     rb_define_readonly_variable("$\"", &rb_features);
     rb_define_readonly_variable("$LOADED_FEATURES", &rb_features);
-    rb_features = rb_ary_new();
 
     rb_define_global_function("load", rb_f_load, -1);
     rb_define_global_function("require", rb_f_require, 1);
@@ -8087,8 +7689,8 @@ Init_load()
     rb_define_global_function("autoload?", rb_f_autoload_p, 1);
     rb_global_variable(&ruby_wrapper);
 
-    rb_global_variable(&ruby_dln_librefs);
     ruby_dln_librefs = rb_ary_new();
+    rb_global_variable(&ruby_dln_librefs);
 }
 
 static void
@@ -8135,8 +7737,12 @@ frame_free(frame)
 {
     struct FRAME *tmp;
 
+    if (frame->argc > 0 && (frame->flags & FRAME_MALLOC))
+        free(frame->argv);
     frame = frame->prev;
     while (frame) {
+	if (frame->argc > 0 && (frame->flags & FRAME_MALLOC))
+	    free(frame->argv);
 	tmp = frame;
 	frame = frame->prev;
 	free(tmp);
@@ -8148,9 +7754,9 @@ blk_free(data)
     struct BLOCK *data;
 {
     void *tmp;
-
+ 
     while (data) {
-	frame_free(&data->frame);
+        frame_free(&data->frame);
 	tmp = data;
 	data = data->prev;
 	free(tmp);
@@ -8161,9 +7767,16 @@ static void
 frame_dup(frame)
     struct FRAME *frame;
 {
+    VALUE *argv;
     struct FRAME *tmp;
 
     for (;;) {
+	if (frame->argc > 0) {
+	    argv = ALLOC_N(VALUE, frame->argc);
+	    MEMCPY(argv, frame->argv, VALUE, frame->argc);
+	    frame->argv = argv;
+	    frame->flags |= FRAME_MALLOC;
+	}
 	frame->tmp = 0;		/* should not preserve tmp */
 	if (!frame->prev) break;
 	tmp = ALLOC(struct FRAME);
@@ -8285,7 +7898,6 @@ rb_f_binding(self)
     if (ruby_frame->prev) {
 	data->frame.last_func = ruby_frame->prev->last_func;
 	data->frame.last_class = ruby_frame->prev->last_class;
-	data->frame.orig_func = ruby_frame->prev->orig_func;
     }
 
     if (data->iter) {
@@ -8471,7 +8083,6 @@ proc_invoke(proc, args, self, klass)
     volatile int safe = ruby_safe_level;
     volatile VALUE old_wrapper = ruby_wrapper;
     volatile int pcall, avalue = Qtrue;
-    volatile VALUE tmp = args;
 
     if (rb_block_given_p() && ruby_frame->last_func) {
 	if (klass != ruby_frame->last_class)
@@ -8496,18 +8107,8 @@ proc_invoke(proc, args, self, klass)
     _block = *data;
     if (self != Qundef) _block.frame.self = self;
     if (klass) _block.frame.last_class = klass;
-    _block.frame.argc = RARRAY(tmp)->len;
-    _block.frame.flags = ruby_frame->flags;
-    if (_block.frame.argc && DMETHOD_P()) {
-        NEWOBJ(scope, struct SCOPE);
-        OBJSETUP(scope, tmp, T_SCOPE);
-        scope->local_tbl = _block.scope->local_tbl;
-        scope->local_vars = _block.scope->local_vars;
-        scope->flags |= SCOPE_CLONE;
-        _block.scope = scope;
-    }
-    /* modify current frame */
     ruby_block = &_block;
+
     PUSH_ITER(ITER_CUR);
     ruby_frame->iter = ITER_CUR;
     PUSH_TAG(pcall ? PROT_LAMBDA : PROT_NONE);
@@ -8533,7 +8134,6 @@ proc_invoke(proc, args, self, klass)
 	proc_jump_error(TAG_RETRY, Qnil); /* xxx */
 	JUMP_TAG(state);
 	break;
-      case TAG_NEXT:
       case TAG_BREAK:
 	if (!pcall && result != Qundef) {
 	    proc_jump_error(state, result);
@@ -8597,14 +8197,15 @@ static VALUE method_arity _((VALUE));
  *  call-seq:
  *     prc.arity -> fixnum
  *  
- *  Returns the number of arguments that would not be ignored. If the block
+ *  Returns the number of arguments required by the block. If the block
  *  is declared to take no arguments, returns 0. If the block is known
  *  to take exactly n arguments, returns n. If the block has optional
  *  arguments, return -n-1, where n is the number of mandatory
- *  arguments. A <code>proc</code> with no argument declarations
- *  is the same a block declaring <code>||</code> as its arguments.
+ *  arguments. A <code>proc</code> with no argument declarations 
+ *  returns -1, as it can accept (and ignore) an arbitrary number of
+ *  parameters.
  *     
- *     Proc.new {}.arity          #=>  0
+ *     Proc.new {}.arity          #=> -1
  *     Proc.new {||}.arity        #=>  0
  *     Proc.new {|a|}.arity       #=>  1
  *     Proc.new {|a,b|}.arity     #=>  2
@@ -8690,7 +8291,7 @@ proc_to_s(self)
     struct BLOCK *data;
     NODE *node;
     char *cname = rb_obj_classname(self);
-    const int w = (sizeof(VALUE) * CHAR_BIT) / 4;
+    const int w = (SIZEOF_LONG * CHAR_BIT) / 4;
     long len = strlen(cname)+6+w; /* 6:tags 16:addr */
     VALUE str;
 
@@ -8698,14 +8299,12 @@ proc_to_s(self)
     if ((node = data->frame.node) || (node = data->body)) {
 	len += strlen(node->nd_file) + 2 + (SIZEOF_LONG*CHAR_BIT-NODE_LSHIFT)/3;
 	str = rb_str_new(0, len);
-	snprintf(RSTRING(str)->ptr, len+1,
-		 "#<%s:0x%.*lx@%s:%d>", cname, w, (VALUE)data->body,
-		 node->nd_file, nd_line(node));
+	sprintf(RSTRING(str)->ptr, "#<%s:0x%.*lx@%s:%d>", cname, w, (VALUE)data->body,
+		node->nd_file, nd_line(node));
     }
     else {
 	str = rb_str_new(0, len);
-	snprintf(RSTRING(str)->ptr, len+1,
-		 "#<%s:0x%.*lx>", cname, w, (VALUE)data->body);
+	sprintf(RSTRING(str)->ptr, "#<%s:0x%.*lx>", cname, w, (VALUE)data->body);
     }
     RSTRING(str)->len = strlen(RSTRING(str)->ptr);
     if (OBJ_TAINTED(self)) OBJ_TAINT(str);
@@ -8798,13 +8397,14 @@ block_pass(self, node)
 	proc = b;
     }
 
-    if (ruby_safe_level >= 1 && OBJ_TAINTED(proc) &&
-	ruby_safe_level > proc_get_safe_level(proc)) {
-	rb_raise(rb_eSecurityError, "Insecure: tainted block value");
+    if (ruby_safe_level >= 1 && OBJ_TAINTED(proc)) {
+	if (ruby_safe_level > proc_get_safe_level(proc)) {
+	    rb_raise(rb_eSecurityError, "Insecure: tainted block value");
+	}
     }
 
     if (ruby_block && ruby_block->block_obj == proc) {
-	PUSH_ITER(ITER_PAS);
+	PUSH_ITER(ITER_PRE);
 	result = rb_eval(self, node->nd_iter);
 	POP_ITER();
 	return result;
@@ -8817,7 +8417,7 @@ block_pass(self, node)
     old_block = ruby_block;
     _block = *data;
     _block.outer = ruby_block;
-    if (orphan) _block.uniq = block_unique++;
+    _block.uniq = block_unique++;
     ruby_block = &_block;
     PUSH_ITER(ITER_PRE);
     if (ruby_frame->iter == ITER_NOT)
@@ -8863,7 +8463,6 @@ struct METHOD {
     VALUE klass, rklass;
     VALUE recv;
     ID id, oid;
-    int safe_level;
     NODE *body;
 };
 
@@ -8903,6 +8502,7 @@ mnew(klass, obj, id, mklass)
 	   (FL_TEST(rklass, FL_SINGLETON) || TYPE(rklass) == T_ICLASS)) {
 	rklass = RCLASS(rklass)->super;
     }
+    if (TYPE(klass) == T_ICLASS) klass = RBASIC(klass)->klass;
     method = Data_Make_Struct(mklass, struct METHOD, bm_mark, free, data);
     data->klass = klass;
     data->recv = obj;
@@ -8910,7 +8510,6 @@ mnew(klass, obj, id, mklass)
     data->body = body;
     data->rklass = rklass;
     data->oid = oid;
-    data->safe_level = NOEX_WITH_SAFE(0);
     OBJ_INFECT(method, klass);
 
     return method;
@@ -9116,21 +8715,26 @@ method_call(argc, argv, method)
 {
     VALUE result = Qnil;	/* OK */
     struct METHOD *data;
-    int safe;
+    int state;
+    volatile int safe = -1;
 
     Data_Get_Struct(method, struct METHOD, data);
     if (data->recv == Qundef) {
-	rb_raise(rb_eTypeError, "can't call unbound method; bind first");
+	rb_raise(rb_eTypeError, "you cannot call unbound method; bind first");
     }
+    PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
+    PUSH_TAG(PROT_NONE);
     if (OBJ_TAINTED(method)) {
-        safe = NOEX_WITH(data->safe_level, 4)|NOEX_TAINTED;
+	safe = ruby_safe_level;
+	if (ruby_safe_level < 4) ruby_safe_level = 4;
     }
-    else {
-	safe = data->safe_level;
+    if ((state = EXEC_TAG()) == 0) {
+	result = rb_call0(data->klass,data->recv,data->id,data->oid,argc,argv,data->body,0);
     }
-    PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
-    result = rb_call0(data->klass,data->recv,data->id,data->oid,argc,argv,data->body,safe);
+    POP_TAG();
     POP_ITER();
+    if (safe >= 0) ruby_safe_level = safe;
+    if (state) JUMP_TAG(state);
     return result;
 }
 
@@ -9230,22 +8834,13 @@ umethod_bind(method, recv)
     VALUE method, recv;
 {
     struct METHOD *data, *bound;
-    VALUE rklass = CLASS_OF(recv);
 
     Data_Get_Struct(method, struct METHOD, data);
-    if (data->rklass != rklass) {
+    if (data->rklass != CLASS_OF(recv)) {
 	if (FL_TEST(data->rklass, FL_SINGLETON)) {
-	    rb_raise(rb_eTypeError, "singleton method bound for a different object");
+	    rb_raise(rb_eTypeError, "singleton method called for a different object");
 	}
-	if (TYPE(data->rklass) == T_MODULE) {
-	    st_table *m_tbl = RCLASS(data->rklass)->m_tbl;
-	    while (RCLASS(rklass)->m_tbl != m_tbl) {
-		rklass = RCLASS(rklass)->super;
-		if (!rklass) goto not_instace;
-	    }
-	}
-	else if (!rb_obj_is_kind_of(recv, data->rklass)) {
-	  not_instace:
+	if(!rb_obj_is_kind_of(recv, data->rklass)) {
 	    rb_raise(rb_eTypeError, "bind argument must be an instance of %s",
 		     rb_class2name(data->rklass));
 	}
@@ -9254,7 +8849,7 @@ umethod_bind(method, recv)
     method = Data_Make_Struct(rb_cMethod,struct METHOD,bm_mark,free,bound);
     *bound = *data;
     bound->recv = recv;
-    bound->rklass = rklass;
+    bound->rklass = CLASS_OF(recv);
 
     return method;
 }
@@ -9314,21 +8909,18 @@ method_arity(method)
       case NODE_IVAR:
 	return INT2FIX(0);
       case NODE_BMETHOD:
-	return proc_arity(body->nd_cval);
       case NODE_DMETHOD:
-	return method_arity(body->nd_cval);
-      case NODE_SCOPE:
+	return proc_arity(body->nd_cval);
+      default:
 	body = body->nd_next;	/* skip NODE_SCOPE */
 	if (nd_type(body) == NODE_BLOCK)
 	    body = body->nd_head;
 	if (!body) return INT2FIX(0);
 	n = body->nd_cnt;
-	if (body->nd_opt || body->nd_rest)
+	if (body->nd_opt || body->nd_rest != -1)
 	    n = -n-1;
 	return INT2FIX(n);
-      default:
-	rb_raise(rb_eArgError, "invalid node 0x%x", nd_type(body));
-   }
+    }
 }
 
 /*
@@ -9377,12 +8969,8 @@ method_inspect(method)
     else {
 	rb_str_buf_cat2(str, rb_class2name(data->rklass));
 	if (data->rklass != data->klass) {
-	    VALUE klass = data -> klass;
-	    if (TYPE(klass) == T_ICLASS) {
-		klass = RBASIC(klass)->klass;
-	    }
 	    rb_str_buf_cat2(str, "(");
-	    rb_str_buf_cat2(str, rb_class2name(klass));
+	    rb_str_buf_cat2(str, rb_class2name(data->klass));
 	    rb_str_buf_cat2(str, ")");
 	}
     }
@@ -9414,12 +9002,9 @@ bmcall(args, method)
     VALUE args, method;
 {
     volatile VALUE a;
-    VALUE ret;
 
     a = svalue_to_avalue(args);
-    ret = method_call(RARRAY(a)->len, RARRAY(a)->ptr, method);
-    a = Qnil; /* prevent tail call */
-    return ret;
+    return method_call(RARRAY(a)->len, RARRAY(a)->ptr, method);
 }
 
 VALUE
@@ -9589,13 +9174,13 @@ Init_Proc()
     rb_define_method(rb_eLocalJumpError, "exit_value", localjump_xvalue, 0);
     rb_define_method(rb_eLocalJumpError, "reason", localjump_reason, 0);
 
-    rb_global_variable(&exception_error);
     exception_error = rb_exc_new2(rb_eFatal, "exception reentered");
+    rb_global_variable(&exception_error);
 
     rb_eSysStackError = rb_define_class("SystemStackError", rb_eStandardError);
-    rb_global_variable(&sysstack_error);
     sysstack_error = rb_exc_new2(rb_eSysStackError, "stack level too deep");
     OBJ_TAINT(sysstack_error);
+    rb_global_variable(&sysstack_error);
 
     rb_cProc = rb_define_class("Proc", rb_cObject);
     rb_undef_alloc_func(rb_cProc);
@@ -9682,7 +9267,6 @@ Init_Binding()
     rb_undef_alloc_func(rb_cBinding);
     rb_undef_method(CLASS_OF(rb_cBinding), "new");
     rb_define_method(rb_cBinding, "clone", proc_clone, 0);
-    rb_define_method(rb_cBinding, "dup", proc_dup, 0);
     rb_define_global_function("binding", rb_f_binding, 0);
 }
 
@@ -9920,15 +9504,6 @@ thread_reset_raised()
 
 static void rb_thread_ready _((rb_thread_t));
 
-static VALUE run_trap_eval _((VALUE));
-static VALUE
-run_trap_eval(arg)
-    VALUE arg;
-{
-    VALUE *p = (VALUE *)arg;
-    return rb_eval_cmd(p[0], p[1], (int)p[2]);
-}
-
 static VALUE
 rb_trap_eval(cmd, sig, safe)
     VALUE cmd;
@@ -9937,21 +9512,20 @@ rb_trap_eval(cmd, sig, safe)
     int state;
     VALUE val = Qnil;		/* OK */
     volatile struct thread_status_t save;
-    VALUE arg[3];
 
-    arg[0] = cmd;
-    arg[1] = rb_ary_new3(1, INT2FIX(sig));
-    arg[2] = (VALUE)safe;
     THREAD_COPY_STATUS(curr_thread, &save);
     rb_thread_ready(curr_thread);
+    PUSH_TAG(PROT_NONE);
     PUSH_ITER(ITER_NOT);
-    val = rb_protect(run_trap_eval, (VALUE)&arg, &state);
+    if ((state = EXEC_TAG()) == 0) {
+	val = rb_eval_cmd(cmd, rb_ary_new3(1, INT2FIX(sig)), safe);
+    }
     POP_ITER();
+    POP_TAG();
     THREAD_COPY_STATUS(&save, curr_thread);
 
     if (state) {
 	rb_trap_immediate = 0;
-	rb_thread_ready(curr_thread);
 	JUMP_TAG(state);
     }
 
@@ -10025,6 +9599,26 @@ timeofday()
 
 #define STACK(addr) (th->stk_pos<(VALUE*)(addr) && (VALUE*)(addr)<th->stk_pos+th->stk_len)
 #define ADJ(addr) (void*)(STACK(addr)?(((VALUE*)(addr)-th->stk_pos)+th->stk_ptr):(VALUE*)(addr))
+#ifdef C_ALLOCA
+# define MARK_FRAME_ADJ(f) rb_gc_mark_frame(f)
+#else
+# define MARK_FRAME_ADJ(f) mark_frame_adj(f, th)
+static void
+mark_frame_adj(frame, th)
+    struct FRAME *frame;
+    rb_thread_t th;
+{
+    if (frame->flags & FRAME_MALLOC) {
+	rb_gc_mark_locations(frame->argv, frame->argv+frame->argc);
+    }
+    else {
+	VALUE *start = ADJ(frame->argv);
+	rb_gc_mark_locations(start, start+frame->argc);
+    }
+    rb_gc_mark((VALUE)frame->node);
+}
+#endif
+
 static void
 thread_mark(th)
     rb_thread_t th;
@@ -10043,11 +9637,9 @@ thread_mark(th)
     rb_gc_mark((VALUE)th->scope);
     rb_gc_mark((VALUE)th->dyna_vars);
     rb_gc_mark(th->errinfo);
-    rb_gc_mark(th->last_status);
     rb_gc_mark(th->last_line);
     rb_gc_mark(th->last_match);
     rb_mark_tbl(th->locals);
-    rb_gc_mark(th->thgroup);
 
     /* mark data in copied stack */
     if (th == curr_thread) return;
@@ -10067,13 +9659,13 @@ thread_mark(th)
     frame = th->frame;
     while (frame && frame != top_frame) {
 	frame = ADJ(frame);
-	rb_gc_mark_frame(frame);
+	MARK_FRAME_ADJ(frame);
 	if (frame->tmp) {
 	    struct FRAME *tmp = frame->tmp;
 
 	    while (tmp && tmp != top_frame) {
 		tmp = ADJ(tmp);
-		rb_gc_mark_frame(tmp);
+		MARK_FRAME_ADJ(tmp);
 		tmp = tmp->prev;
 	    }
 	}
@@ -10082,21 +9674,11 @@ thread_mark(th)
     block = th->block;
     while (block) {
 	block = ADJ(block);
-	rb_gc_mark_frame(&block->frame);
+	MARK_FRAME_ADJ(&block->frame);
 	block = block->prev;
     }
 }
 
-static int
-mark_loading_thread(key, value, lev)
-    ID key;
-    VALUE value;
-    int lev;
-{
-    rb_gc_mark(((rb_thread_t)value)->thread);
-    return ST_CONTINUE;
-}
-
 void
 rb_gc_mark_threads()
 {
@@ -10106,38 +9688,9 @@ rb_gc_mark_threads()
     rb_gc_mark((VALUE)ruby_cref);
 
     if (!curr_thread) return;
-    rb_gc_mark(main_thread->thread);
-    rb_gc_mark(curr_thread->thread);
-    FOREACH_THREAD_FROM(main_thread, th) {
-	switch (th->status) {
-	  case THREAD_TO_KILL:
-	  case THREAD_RUNNABLE:
-	    break;
-	  case THREAD_STOPPED:
-	    if (th->wait_for) break;
-	  default:
-	    continue;
-	}
+    FOREACH_THREAD(th) {
 	rb_gc_mark(th->thread);
-    } END_FOREACH_FROM(main_thread, th);
-    if (loading_tbl) st_foreach(loading_tbl, mark_loading_thread, 0);
-}
-
-void
-rb_gc_abort_threads()
-{
-    rb_thread_t th;
-
-    if (!main_thread)
-        return;
-
-    FOREACH_THREAD_FROM(main_thread, th) {
-	if (FL_TEST(th->thread, FL_MARK)) continue;
-	if (th->status == THREAD_STOPPED) {
-	    th->status = THREAD_TO_KILL;
-	    rb_gc_mark(th->thread);
-	}
-    } END_FOREACH_FROM(main_thread, th);
+    } END_FOREACH(th);
 }
 
 static void
@@ -10199,9 +9752,7 @@ rb_thread_save_context(th)
     th->stk_len = 0;
     th->stk_pos = pos;
     if (len > th->stk_max) {
-	VALUE *ptr = realloc(th->stk_ptr, sizeof(VALUE) * len);
-	if (!ptr) rb_memerror();
-	th->stk_ptr = ptr;
+	REALLOC_N(th->stk_ptr, VALUE, len);
 	th->stk_max = len;
     }
     th->stk_len = len;
@@ -10230,7 +9781,6 @@ rb_thread_save_context(th)
 
     th->frame = ruby_frame;
     th->scope = ruby_scope;
-    ruby_scope->flags |= SCOPE_DONT_RECYCLE;
     th->klass = ruby_class;
     th->wrapper = ruby_wrapper;
     th->cref = ruby_cref;
@@ -10282,10 +9832,8 @@ rb_thread_switch(n)
       case RESTORE_EXIT:
 	ruby_errinfo = th_raise_exception;
 	ruby_current_node = th_raise_node;
-	if (!rb_obj_is_kind_of(ruby_errinfo, rb_eSystemExit)) {
-	    terminate_process(EXIT_FAILURE, ruby_errinfo);
-	}
-	rb_exc_raise(th_raise_exception);
+	error_print();
+	terminate_process(EXIT_FAILURE, 0, 0);
 	break;
       case RESTORE_NORMAL:
       default:
@@ -10296,12 +9844,12 @@ rb_thread_switch(n)
 
 #define THREAD_SAVE_CONTEXT(th) \
     (rb_thread_save_context(th),\
-     rb_thread_switch((FLUSH_REGISTER_WINDOWS, ruby_setjmp((th)->context))))
+     rb_thread_switch((FLUSH_REGISTER_WINDOWS, setjmp((th)->context))))
 
 NORETURN(static void rb_thread_restore_context _((rb_thread_t,int)));
 
-# if defined(_MSC_VER) && _MSC_VER >= 1300
-__declspec(noinline) static void stack_extend(rb_thread_t, int);
+# if _MSC_VER >= 1300
+__declspec(noinline)
 # endif
 static void
 stack_extend(th, exit)
@@ -10377,7 +9925,7 @@ rb_thread_restore_context(th, exit)
     rb_backref_set(tmp->last_match);
     tmp->last_match = tval;
 
-    ruby_longjmp(tmp->context, ex);
+    longjmp(tmp->context, ex);
 }
 
 static void
@@ -10804,7 +10352,6 @@ rb_thread_fd_writable(fd)
     if (rb_thread_critical) return Qtrue;
     if (curr_thread == curr_thread->next) return Qtrue;
     if (curr_thread->status == THREAD_TO_KILL) return Qtrue;
-    if (curr_thread->status == THREAD_KILLED) return Qtrue;
 
     curr_thread->status = THREAD_STOPPED;
     FD_ZERO(&curr_thread->readfds);
@@ -10845,7 +10392,7 @@ rb_thread_wait_for(time)
 #ifdef ERESTART
 		  case ERESTART:
 #endif
-		    break;
+		    return;
 		  default:
 		    rb_sys_fail("sleep");
 		}
@@ -10885,9 +10432,7 @@ rb_thread_select(max, read, write, except, timeout)
     fd_set *read, *write, *except;
     struct timeval *timeout;
 {
-#ifndef linux
     double limit;
-#endif
     int n;
 
     if (!read && !write && !except) {
@@ -10899,12 +10444,10 @@ rb_thread_select(max, read, write, except, timeout)
 	return 0;
     }
 
-#ifndef linux
     if (timeout) {
 	limit = timeofday()+
 	    (double)timeout->tv_sec+(double)timeout->tv_usec*1e-6;
     }
-#endif
 
     if (rb_thread_critical ||
 	curr_thread == curr_thread->next ||
@@ -11750,7 +11293,7 @@ rb_thread_start_0(fn, arg, th)
 {
     volatile rb_thread_t th_save = th;
     volatile VALUE thread = th->thread;
-    struct BLOCK *volatile saved_block = 0;
+    struct BLOCK *volatile saved_block = 0, *block;
     enum thread_status status;
     int state;
 
@@ -11842,7 +11385,6 @@ rb_thread_start_0(fn, arg, th)
 	}
 	else if (th->safe < 4 && (ruby_thread_abort || th->abort || RTEST(ruby_debug))) {
 	    /* exit on main_thread */
-	    error_print();
 	    rb_thread_main_jump(ruby_errinfo, RESTORE_EXIT);
 	}
 	else {
@@ -11948,21 +11490,10 @@ static VALUE
 rb_thread_initialize(thread, args)
     VALUE thread, args;
 {
-    rb_thread_t th;
-
     if (!rb_block_given_p()) {
 	rb_raise(rb_eThreadError, "must be called with a block");
     }
-    th = rb_thread_check(thread);
-    if (th->stk_max) {
-	NODE *node = th->node;
-	if (!node) {
-	    rb_raise(rb_eThreadError, "already initialized thread");
-	}
-	rb_raise(rb_eThreadError, "already initialized thread - %s:%d",
-		 node->nd_file, nd_line(node));
-    }
-    return rb_thread_start_0(rb_thread_yield, args, th);
+    return rb_thread_start_0(rb_thread_yield, args, rb_thread_check(thread));
 }
 
 
@@ -12223,10 +11754,6 @@ rb_thread_trap_eval(cmd, sig, safe)
     int sig, safe;
 {
     rb_thread_critical = 0;
-    if (curr_thread == main_thread) {
-	rb_trap_eval(cmd, sig, safe);
-	return;
-    }
     if (!rb_thread_dead(curr_thread)) {
 	if (THREAD_SAVE_CONTEXT(curr_thread)) {
 	    return;
@@ -12239,28 +11766,6 @@ rb_thread_trap_eval(cmd, sig, safe)
     rb_thread_restore_context(curr_thread, RESTORE_TRAP);
 }
 
-void
-rb_thread_signal_exit()
-{
-    VALUE args[2];
-
-    rb_thread_critical = 0;
-    if (curr_thread == main_thread) {
-	rb_thread_ready(curr_thread);
-	rb_exit(EXIT_SUCCESS);
-    }
-    args[0] = INT2NUM(EXIT_SUCCESS);
-    args[1] = rb_str_new2("exit");
-    rb_thread_ready(main_thread);
-    if (!rb_thread_dead(curr_thread)) {
-	if (THREAD_SAVE_CONTEXT(curr_thread)) {
-	    return;
-	}
-    }
-    rb_thread_main_jump(rb_class_new_instance(2, args, rb_eSystemExit), 
-			RESTORE_EXIT);
-}
-
 static VALUE
 rb_thread_raise(argc, argv, th)
     int argc;
@@ -12496,10 +12001,9 @@ rb_thread_inspect(thread)
     rb_thread_t th = rb_thread_check(thread);
     const char *status = thread_status_name(th->status);
     VALUE str;
-    size_t len = strlen(cname)+7+16+9+1;
 
-    str = rb_str_new(0, len); /* 7:tags 16:addr 9:status 1:nul */
-    snprintf(RSTRING(str)->ptr, len, "#<%s:0x%lx %s>", cname, thread, status);
+    str = rb_str_new(0, strlen(cname)+7+16+9+1); /* 7:tags 16:addr 9:status 1:nul */
+    sprintf(RSTRING(str)->ptr, "#<%s:0x%lx %s>", cname, thread, status);
     RSTRING(str)->len = strlen(RSTRING(str)->ptr);
     OBJ_INFECT(str, thread);
 
@@ -12571,7 +12075,7 @@ rb_thread_atfork()
  *     3:  15 16
  */
 
-VALUE rb_cCont;
+static VALUE rb_cCont;
 
 /*
  *  call-seq:
@@ -12596,6 +12100,7 @@ rb_callcc(self)
     volatile rb_thread_t th_save;
     struct tag *tag;
     struct RVarmap *vars;
+    struct BLOCK *blk;
 
     THREAD_ALLOC(th);
     cont = Data_Wrap_Struct(rb_cCont, thread_mark, thread_free, th);
@@ -12605,7 +12110,6 @@ rb_callcc(self)
 	scope_dup(tag->scope);
     }
     th->thread = curr_thread->thread;
-    th->thgroup = cont_protect;
 
     for (vars = ruby_dyna_vars; vars; vars = vars->next) {
 	if (FL_TEST(vars, DVAR_DONT_RECYCLE)) break;
@@ -12647,9 +12151,6 @@ rb_cont_call(argc, argv, cont)
     if (th->thread != curr_thread->thread) {
 	rb_raise(rb_eRuntimeError, "continuation called across threads");
     }
-    if (th->thgroup != cont_protect) {
-	rb_raise(rb_eRuntimeError, "continuation called across trap");
-    }
     switch (argc) {
       case 0:
 	th->result = Qnil;
@@ -12750,7 +12251,7 @@ thgroup_list(group)
  *     ThreadError: can't move from the enclosed thread group
  */
 
-static VALUE
+VALUE
 thgroup_enclose(group)
     VALUE group;
 {
@@ -12818,10 +12319,6 @@ thgroup_add(group, thread)
 
     rb_secure(4);
     th = rb_thread_check(thread);
-    if (!th->next || !th->prev) {
-	rb_raise(rb_eTypeError, "wrong argument type %s (expected Thread)",
-		 rb_obj_classname(thread));
-    }
 
     if (OBJ_FROZEN(group)) {
       rb_raise(rb_eThreadError, "can't move to the frozen thread group");
@@ -12917,7 +12414,6 @@ Init_Thread()
     rb_define_method(rb_cCont, "call", rb_cont_call, -1);
     rb_define_method(rb_cCont, "[]", rb_cont_call, -1);
     rb_define_global_function("callcc", rb_callcc, 0);
-    rb_global_variable(&cont_protect);
 
     cThGroup = rb_define_class("ThreadGroup", rb_cObject);
     rb_define_alloc_func(cThGroup, thgroup_s_alloc);
@@ -12925,9 +12421,9 @@ Init_Thread()
     rb_define_method(cThGroup, "enclose", thgroup_enclose, 0);
     rb_define_method(cThGroup, "enclosed?", thgroup_enclosed_p, 0);
     rb_define_method(cThGroup, "add", thgroup_add, 1);
-    rb_global_variable(&thgroup_default);
     thgroup_default = rb_obj_alloc(cThGroup);
     rb_define_const(cThGroup, "Default", thgroup_default);
+    rb_global_variable(&thgroup_default);
 
     /* allocate main thread */
     main_thread = rb_thread_alloc(rb_cThread);
@@ -13060,13 +12556,3 @@ rb_throw(tag, val)
     argv[1] = val;
     rb_f_throw(2, argv);
 }
-
-/* flush_register_windows must not be inlined because flushrs doesn't flush
- * current frame in register stack. */
-#ifdef __ia64__
-void flush_register_windows(void)
-{
-    __asm__ ("flushrs");
-}
-#endif
-
diff --git a/ext/.document b/ext/.document
index ba8182593e..797d8dcef8 100644
--- a/ext/.document
+++ b/ext/.document
@@ -1,11 +1,5 @@
 # Add files to this as they become documented
 
-enumerator/enumerator.c
 iconv/iconv.c
-nkf/lib/kconv.rb
-nkf/nkf.c
-socket/socket.c
-stringio/stringio.c
 strscan/strscan.c
-win32ole
 zlib/zlib.c
diff --git a/ext/Win32API/Win32API.c b/ext/Win32API/Win32API.c
index 96ce8c6636..776df56ecb 100644
--- a/ext/Win32API/Win32API.c
+++ b/ext/Win32API/Win32API.c
@@ -53,12 +53,12 @@ Win32API_initialize(self, dllname, proc, import, export)
     hdll = LoadLibrary(RSTRING(dllname)->ptr);
     if (!hdll)
 	rb_raise(rb_eRuntimeError, "LoadLibrary: %s\n", RSTRING(dllname)->ptr);
-    rb_iv_set(self, "__hdll__", Data_Wrap_Struct(rb_cData, 0, Win32API_FreeLibrary, (void*)hdll));
-    hproc = (HANDLE)GetProcAddress(hdll, RSTRING(proc)->ptr);
+    rb_iv_set(self, "__hdll__", Data_Wrap_Struct(rb_cData, 0, Win32API_FreeLibrary, hdll));
+    hproc = GetProcAddress(hdll, RSTRING(proc)->ptr);
     if (!hproc) {
 	str = rb_str_new3(proc);
 	str = rb_str_cat(str, "A", 1);
-	hproc = (HANDLE)GetProcAddress(hdll, RSTRING(str)->ptr);
+	hproc = GetProcAddress(hdll, RSTRING(str)->ptr);
 	if (!hproc)
 	    rb_raise(rb_eRuntimeError, "GetProcAddress: %s or %s\n",
 		RSTRING(proc)->ptr, RSTRING(str)->ptr);
@@ -137,9 +137,6 @@ Win32API_initialize(self, dllname, proc, import, export)
     return Qnil;
 }
 
-#ifdef _MSC_VER
-#pragma optimize("g", off)
-#endif
 static VALUE
 Win32API_Call(argc, argv, obj)
     int argc;
@@ -163,7 +160,7 @@ Win32API_Call(argc, argv, obj)
 
 
     if (items != nimport)
-	rb_raise(rb_eRuntimeError, "wrong number of parameters: expected %d, got %d",
+	rb_raise(rb_eRuntimeError, "Wrong number of parameters: expected %d, got %d.\n",
 	    nimport, items);
 
     for (i = 0; i < nimport; i++) {
diff --git a/ext/Win32API/extconf.rb b/ext/Win32API/extconf.rb
index 865788556f..134a6e5b92 100644
--- a/ext/Win32API/extconf.rb
+++ b/ext/Win32API/extconf.rb
@@ -1,6 +1,5 @@
 require 'mkmf'
 
-dir_config("win32")
 if have_header("windows.h") and have_library("kernel32")
   create_makefile("Win32API")
 end
diff --git a/ext/Win32API/lib/win32/resolv.rb b/ext/Win32API/lib/win32/resolv.rb
index 6534d20760..5a99d04d55 100644
--- a/ext/Win32API/lib/win32/resolv.rb
+++ b/ext/Win32API/lib/win32/resolv.rb
@@ -84,7 +84,7 @@ if info.unpack('V5')[4] == 2  # VER_PLATFORM_WIN32_NT
                   [ 'NameServer', 'DhcpNameServer' ].each do |key|
                     ns = regif.read_s(key)
                     unless ns.empty?
-                      nameserver.concat(ns.split(/[,\s]\s*/))
+                      nameserver.concat(ns.split(/\s+/))
                       break
                     end
                   end
@@ -141,7 +141,7 @@ else
               slist = reg.read_s("SearchList")
               search << domain unless domain.empty?
               search.concat(slist.split(/,\s*/))
-              nameserver.concat(ns.split(/[,\s]\s*/))
+              nameserver.concat(ns.split(/,\s*/))
             end
           end
         rescue Registry::Error
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index fd0cd65418..4ccba8809a 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -13,7 +13,6 @@
  *
  */
 
-#include "ruby.h"
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -21,6 +20,7 @@
 #include <errno.h>
 #include <float.h>
 #include <math.h>
+#include "ruby.h"
 #include "math.h"
 #include "version.h"
  
@@ -41,123 +41,8 @@ VALUE rb_cBigDecimal;
  */
 #define DoSomeOne(x,y) rb_num_coerce_bin(x,y)
 
-#if 0
-/* BigDecimal provides arbitrary-precision floating point decimal arithmetic.
- *
- * Copyright (C) 2002 by Shigeo Kobayashi <shigeo@tinyforest.gr.jp>.
- * You may distribute under the terms of either the GNU General Public
- * License or the Artistic License, as specified in the README file
- * of the BigDecimal distribution.
- *
- * Documented by mathew <meta@pobox.com>.
- *
- * = Introduction
- *
- * Ruby provides built-in support for arbitrary precision integer arithmetic.
- * For example:
- *
- * 42**13   ->   1265437718438866624512
- *
- * BigDecimal provides similar support for very large or very accurate floating
- * point numbers.
- *
- * Decimal arithmetic is also useful for general calculation, because it
- * provides the correct answers people expect--whereas normal binary floating
- * point arithmetic often introduces subtle errors because of the conversion
- * between base 10 and base 2. For example, try:
- *
- *   sum = 0
- *   for i in (1..10000)
- *     sum = sum + 0.0001
- *   end
- *   print sum
- *
- * and contrast with the output from:
- *
- *   require 'bigdecimal'
- *
- *   sum = BigDecimal.new("0")
- *   for i in (1..10000)
- *     sum = sum + BigDecimal.new("0.0001")
- *   end
- *   print sum
- *
- * Similarly:
- *
- * (BigDecimal.new("1.2") - BigDecimal("1.0")) == BigDecimal("0.2") -> true
- *
- * (1.2 - 1.0) == 0.2 -> false
- *
- * = Special features of accurate decimal arithmetic
- *
- * Because BigDecimal is more accurate than normal binary floating point
- * arithmetic, it requires some special values.
- *
- * == Infinity
- *
- * BigDecimal sometimes needs to return infinity, for example if you divide
- * a value by zero.
- *
- * BigDecimal.new("1.0") / BigDecimal.new("0.0")  -> infinity
- *
- * BigDecimal.new("-1.0") / BigDecimal.new("0.0")  -> -infinity
- *
- * You can represent infinite numbers to BigDecimal using the strings
- * 'Infinity', '+Infinity' and '-Infinity' (case-sensitive)
- *
- * == Not a Number
- *
- * When a computation results in an undefined value, the special value NaN
- * (for 'not a number') is returned.
- *
- * Example:
- *
- * BigDecimal.new("0.0") / BigDecimal.new("0.0") -> NaN
- *
- * You can also create undefined values.  NaN is never considered to be the
- * same as any other value, even NaN itself:
- *
- * n = BigDecimal.new('NaN')
- *
- * n == 0.0 -> nil
- *
- * n == n -> nil
- *
- * == Positive and negative zero
- *
- * If a computation results in a value which is too small to be represented as
- * a BigDecimal within the currently specified limits of precision, zero must
- * be returned.
- *
- * If the value which is too small to be represented is negative, a BigDecimal
- * value of negative zero is returned. If the value is positive, a value of
- * positive zero is returned.
- *
- * BigDecimal.new("1.0") / BigDecimal.new("-Infinity") -> -0.0
- *
- * BigDecimal.new("1.0") / BigDecimal.new("Infinity") -> 0.0
- *
- * (See BigDecimal.mode for how to specify limits of precision.)
- *
- * Note that -0.0 and 0.0 are considered to be the same for the purposes of
- * comparison.
- *
- * Note also that in mathematics, there is no particular concept of negative 
- * or positive zero; true mathematical zero has no sign.
- */
-void
-Init_BigDecimal()
-{
-    /* This is a #if-ed out function to fool Rdoc into documenting the class. */
-    /* The real init function is Init_bigdecimal() further down. */
-}
-#endif
-
 /*
- * Returns the BigDecimal version number.
- *
- * Ruby 1.8.0 returns 1.0.0.
- * Ruby 1.8.1 thru 1.8.3 return 1.0.1.
+ *  **** BigDecimal version ****
  */
 static VALUE
 BigDecimal_version(VALUE self)
@@ -247,28 +132,12 @@ SomeOneMayDoIt:
     return NULL; /* NULL means to coerce */
 }
 
-/* call-seq:
- * BigDecimal.double_fig
- *
- * The BigDecimal.double_fig class method returns the number of digits a
- * Float number is allowed to have. The result depends upon the CPU and OS
- * in use.
- */
 static VALUE
 BigDecimal_double_fig(VALUE self)
 {
     return INT2FIX(VpDblFig());
 }
 
-/* call-seq:
- * precs
- *
- * Returns an Array of two Integer values.
- *
- * The first value is the current number of significant digits in the 
- * BigDecimal. The second value is the maximum number of significant digits
- * for the BigDecimal.
- */
 static VALUE
 BigDecimal_prec(VALUE self)
 {
@@ -319,9 +188,6 @@ BigDecimal_dump(int argc, VALUE *argv, VALUE self)
     return rb_str_new2(psz);
 }
 
-/*
- * Internal method used to provide marshalling support. See the Marshal module.
- */
 static VALUE
 BigDecimal_load(VALUE self, VALUE str)
 {
@@ -336,7 +202,7 @@ BigDecimal_load(VALUE self, VALUE str)
     /* First get max prec */
     while((*pch)!=(unsigned char)'\0' && (ch=*pch++)!=(unsigned char)':') {
         if(!ISDIGIT(ch)) {
-            rb_raise(rb_eTypeError, "load failed: invalid character in the marshaled string");
+            rb_raise(rb_eTypeError, "Load failed: invalid character in the marshaled string");
         }
         m = m*10 + (unsigned long)(ch-'0');
     }
@@ -347,44 +213,6 @@ BigDecimal_load(VALUE self, VALUE str)
     return ToValue(pv);
 }
 
- /* call-seq:
-  * BigDecimal.mode(mode, value)
-  *
-  * Controls handling of arithmetic exceptions and rounding. If no value
-  * is supplied, the current value is returned.
-  *
-  * Six values of the mode parameter control the handling of arithmetic
-  * exceptions:
-  *
-  * BigDecimal::EXCEPTION_NaN
-  * BigDecimal::EXCEPTION_INFINITY
-  * BigDecimal::EXCEPTION_UNDERFLOW
-  * BigDecimal::EXCEPTION_OVERFLOW
-  * BigDecimal::EXCEPTION_ZERODIVIDE
-  * BigDecimal::EXCEPTION_ALL
-  *
-  * For each mode parameter above, if the value set is false, computation 
-  * continues after an arithmetic exception of the appropriate type. 
-  * When computation continues, results are as follows:
-  *
-  * EXCEPTION_NaN:: NaN
-  * EXCEPTION_INFINITY:: +infinity or -infinity
-  * EXCEPTION_UNDERFLOW:: 0
-  * EXCEPTION_OVERFLOW:: +infinity or -infinity
-  * EXCEPTION_ZERODIVIDE:: +infinity or -infinity
-  *
-  * One value of the mode parameter controls the rounding of numeric values:
-  * BigDecimal::ROUND_MODE. The values it can take are:
-  *
-  * ROUND_UP:: round away from zero
-  * ROUND_DOWN:: round towards zero (truncate)
-  * ROUND_HALF_UP:: round up if the appropriate digit >= 5, otherwise truncate (default)
-  * ROUND_HALF_DOWN:: round up if the appropriate digit >= 6, otherwise truncate
-  * ROUND_HALF_EVEN:: round towards the even neighbor (Banker's rounding)
-  * ROUND_CEILING:: round towards positive infinity (ceil)
-  * ROUND_FLOOR:: round towards negative infinity (floor)
-  *
-  */
 static VALUE
 BigDecimal_mode(int argc, VALUE *argv, VALUE self)
 {
@@ -402,7 +230,7 @@ BigDecimal_mode(int argc, VALUE *argv, VALUE self)
         fo = VpGetException();
         if(val==Qnil) return INT2FIX(fo);
         if(val!=Qfalse && val!=Qtrue) {
-            rb_raise(rb_eTypeError, "second argument must be true or false");
+            rb_raise(rb_eTypeError, "The second argument must be true or false.");
             return Qnil; /* Not reached */
         }
         if(f&VP_EXCEPTION_INFINITY) {
@@ -422,13 +250,13 @@ BigDecimal_mode(int argc, VALUE *argv, VALUE self)
         if(val==Qnil) return INT2FIX(fo);
         Check_Type(val, T_FIXNUM);
         if(!VpIsRoundMode(FIX2INT(val))) {
-            rb_raise(rb_eTypeError, "invalid rounding mode");
+            rb_raise(rb_eTypeError, "Invalid rounding mode.");
             return Qnil;
         }
         fo = VpSetRoundMode((unsigned long)FIX2INT(val));
         return INT2FIX(fo);
     }
-    rb_raise(rb_eTypeError, "first argument for BigDecimal#mode invalid");
+    rb_raise(rb_eTypeError, "The first argument for BigDecimal#mode is invalid.");
     return Qnil;
 }
 
@@ -481,7 +309,7 @@ VpCreateRbObject(U_LONG mx, char *str)
     return pv;
 }
 
-/* Returns True if the value is Not a Number */
+
 static VALUE
 BigDecimal_IsNaN(VALUE self)
 {
@@ -490,7 +318,6 @@ BigDecimal_IsNaN(VALUE self)
     return Qfalse;
 }
 
-/* Returns True if the value is infinite */
 static VALUE
 BigDecimal_IsInfinite(VALUE self)
 {
@@ -500,7 +327,6 @@ BigDecimal_IsInfinite(VALUE self)
     return Qnil;
 }
 
-/* Returns True if the value is finite (not NaN or infinite) */
 static VALUE
 BigDecimal_IsFinite(VALUE self)
 {
@@ -510,10 +336,6 @@ BigDecimal_IsFinite(VALUE self)
     return Qtrue;
 }
 
-/* Returns the value as an integer (Fixnum or Bignum).
- *
- * If the BigNumber is infinity or NaN, returns nil.
- */
 static VALUE
 BigDecimal_to_i(VALUE self)
 {
@@ -577,10 +399,6 @@ BigDecimal_induced_from(VALUE self, VALUE x)
     return p->obj;
 }
 
-/* Returns a new Float object having approximately the same value as the
- * BigDecimal number. Normal accuracy limits and built-in errors of binary
- * Float arithmetic apply.
- */
 static VALUE
 BigDecimal_to_f(VALUE self)
 {
@@ -594,27 +412,13 @@ BigDecimal_to_f(VALUE self)
     errno = 0;
     d2 = pow(10.0,(double)e);
     if((errno == ERANGE && e>0) || (d2>1.0 && (fabs(d) > (DBL_MAX / d2)))) {
-       VpException(VP_EXCEPTION_OVERFLOW,"BigDecimal to Float conversion",0);
+       VpException(VP_EXCEPTION_OVERFLOW,"BigDecimal to Float conversion.",0);
        if(d>0.0) return rb_float_new(DBL_MAX);
        else      return rb_float_new(-DBL_MAX);
     }
     return rb_float_new(d*d2);
 }
 
-/* The coerce method provides support for Ruby type coercion. It is not
- * enabled by default.
- * 
- * This means that binary operations like + * / or - can often be performed 
- * on a BigDecimal and an object of another type, if the other object can
- * be coerced into a BigDecimal value.
- *
- * e.g.
- * a = BigDecimal.new("1.0")
- * b = a / 2.0  -> 0.5
- *
- * Note that coercing a String to a BigDecimal is not supported by default;
- * it requires a special compile-time option when building Ruby.
- */
 static VALUE
 BigDecimal_coerce(VALUE self, VALUE other)
 {
@@ -636,17 +440,6 @@ BigDecimal_uplus(VALUE self)
     return self;
 }
 
- /* call-seq:
-  * add(value, digits)
-  *
-  * Add the specified value. 
-  *
-  * e.g.
-  *   c = a.add(b,n)
-  *   c = a + b
-  *
-  * digits:: If specified and less than the number of significant digits of the result, the result is rounded to that number of digits, according to BigDecimal.mode.
-  */
 static VALUE
 BigDecimal_add(VALUE self, VALUE r)
 {
@@ -674,17 +467,6 @@ BigDecimal_add(VALUE self, VALUE r)
     return ToValue(c);
 }
 
- /* call-seq:
-  * sub(value, digits)
-  *
-  * Subtract the specified value. 
-  *
-  * e.g.
-  *   c = a.sub(b,n)
-  *   c = a - b
-  *
-  * digits:: If specified and less than the number of significant digits of the result, the result is rounded to that number of digits, according to BigDecimal.mode.
-  */
 static VALUE
 BigDecimal_sub(VALUE self, VALUE r)
 {
@@ -740,7 +522,6 @@ BigDecimalCmp(VALUE self, VALUE r,char op)
     rb_bug("Undefined operation in BigDecimalCmp()");
 }
 
-/* Returns True if the value is zero. */
 static VALUE
 BigDecimal_zero(VALUE self)
 {
@@ -748,7 +529,6 @@ BigDecimal_zero(VALUE self)
     return VpIsZero(a) ? Qtrue : Qfalse;
 }
 
-/* Returns True if the value is non-zero. */
 static VALUE
 BigDecimal_nonzero(VALUE self)
 {
@@ -756,84 +536,42 @@ BigDecimal_nonzero(VALUE self)
     return VpIsZero(a) ? Qnil : self;
 }
 
-/* The comparison operator.
- * a <=> b is 0 if a == b, 1 if a > b, -1 if a < b.
- */
 static VALUE
 BigDecimal_comp(VALUE self, VALUE r)
 {
     return BigDecimalCmp(self, r, '*');
 }
 
-/*
- * Tests for value equality; returns true if the values are equal.
- *
- * The == and === operators and the eql? method have the same implementation 
- * for BigDecimal.
- *
- * Values may be coerced to perform the comparison:
- *
- * BigDecimal.new('1.0') == 1.0  -> true
- */
 static VALUE
 BigDecimal_eq(VALUE self, VALUE r)
 {
     return BigDecimalCmp(self, r, '=');
 }
 
-/* Returns true if the values are not equal in value. Values may be coerced
- * to perform the comparison:
- *
- * BigDecimal.new('1.0') != 1.0  -> false
- */
 static VALUE
 BigDecimal_ne(VALUE self, VALUE r)
 {
     return BigDecimalCmp(self, r, '!');
 }
 
-/* call-seq:
- * a < b
- *
- * Returns true if a is less than b. Values may be coerced to perform the
- * comparison (see ==, coerce).
- */
 static VALUE
 BigDecimal_lt(VALUE self, VALUE r)
 {
     return BigDecimalCmp(self, r, '<');
 }
 
-/* call-seq:
- * a <= b
- *
- * Returns true if a is less than or equal to b. Values may be coerced to 
- * perform the comparison (see ==, coerce).
- */
 static VALUE
 BigDecimal_le(VALUE self, VALUE r)
 {
     return BigDecimalCmp(self, r, 'L');
 }
 
-/* call-seq:
- * a > b
- *
- * Returns true if a is greater than b.  Values may be coerced to 
- * perform the comparison (see ==, coerce).
- */
 static VALUE
 BigDecimal_gt(VALUE self, VALUE r)
 {
     return BigDecimalCmp(self, r, '>');
 }
 
-/* call-seq:
- * a >= b
- *
- * Returns true if a is greater than or equal to b. Values may be coerced to 
- * perform the comparison (see ==, coerce)
- */
 static VALUE
 BigDecimal_ge(VALUE self, VALUE r)
 {
@@ -851,17 +589,6 @@ BigDecimal_neg(VALUE self)
     return ToValue(c);
 }
 
- /* call-seq:
-  * mult(value, digits)
-  *
-  * Multiply by the specified value. 
-  *
-  * e.g.
-  *   c = a.mult(b,n)
-  *   c = a * b
-  *
-  * digits:: If specified and less than the number of significant digits of the result, the result is rounded to that number of digits, according to BigDecimal.mode.
-  */
 static VALUE
 BigDecimal_mult(VALUE self, VALUE r)
 {
@@ -900,23 +627,6 @@ BigDecimal_divide(Real **c, Real **res, Real **div, VALUE self, VALUE r)
     return (VALUE)0;
 }
 
- /* call-seq:
-  * div(value, digits)
-  * quo(value)
-  *
-  * Divide by the specified value. 
-  *
-  * e.g.
-  *   c = a.div(b,n)
-  *
-  * digits:: If specified and less than the number of significant digits of the result, the result is rounded to that number of digits, according to BigDecimal.mode.
-  * 
-  * If digits is 0, the result is the same as the / operator. If not, the
-  * result is an integer BigDecimal, by analogy with Float#div.
-  *
-  * The alias quo is provided since div(value, 0) is the same as computing
-  * the quotient; see divmod.
-  */
 static VALUE
 BigDecimal_div(VALUE self, VALUE r)
 /* For c = self/r: with round operation */
@@ -995,12 +705,6 @@ NaN:
     return (VALUE)0;
 }
 
-/* call-seq:
- * a % b
- * a.modulo(b)
- *
- * Returns the modulus from dividing by b. See divmod.
- */
 static VALUE
 BigDecimal_mod(VALUE self, VALUE r) /* %: a%b = a - (a.to_f/b).floor * b */
 {
@@ -1051,13 +755,6 @@ BigDecimal_divremain(VALUE self, VALUE r, Real **dv, Real **rv)
     return (VALUE)0;
 }
 
-/* Returns the remainder from dividing by the value.
- *
- * If the values divided are of the same sign, the remainder is the same as
- * the modulus (see divmod).
- *
- * Otherwise, the remainder is the modulus minus the value divided by.
- */
 static VALUE
 BigDecimal_remainder(VALUE self, VALUE r) /* remainder */
 {
@@ -1068,25 +765,6 @@ BigDecimal_remainder(VALUE self, VALUE r) /* remainder */
     return ToValue(rv);
 }
 
-/* Divides by the specified value, and returns the quotient and modulus
- * as BigDecimal numbers. The quotient is rounded towards negative infinity.
- *
- * For example:
- *
- * require 'bigdecimal'
- *
- * a = BigDecimal.new("42")
- * b = BigDecimal.new("9")
- *
- * q,m = a.divmod(b)
- *
- * c = q * b + m
- *
- * a == c  -> true
- *
- * The quotient q is (a/b).floor, and the modulus is the amount that must be 
- * added to q * b to get a.
- */
 static VALUE
 BigDecimal_divmod(VALUE self, VALUE r)
 {
@@ -1188,12 +866,6 @@ BigDecimal_mult2(VALUE self, VALUE b, VALUE n)
     }
 }
 
-/* Returns the absolute value.
- *
- * BigDecimal('5').abs -> 5
- *
- * BigDecimal('-3').abs -> 3
- */
 static VALUE
 BigDecimal_abs(VALUE self)
 {
@@ -1209,13 +881,6 @@ BigDecimal_abs(VALUE self)
     return ToValue(c);
 }
 
-/* call-seq:
- * sqrt(n)
- *
- * Returns the square root of the value.
- *
- * If n is specified, returns at least that many significant digits.
- */
 static VALUE
 BigDecimal_sqrt(VALUE self, VALUE nFig)
 {
@@ -1233,8 +898,6 @@ BigDecimal_sqrt(VALUE self, VALUE nFig)
     return ToValue(c);
 }
 
-/* Return the integer part of the number.
- */
 static VALUE
 BigDecimal_fix(VALUE self)
 {
@@ -1249,28 +912,6 @@ BigDecimal_fix(VALUE self)
     return ToValue(c);
 }
 
-/* call-seq:
- * round(n,mode)
- *
- * Round to the nearest 1 (by default), returning the result as a BigDecimal.
- *
- * BigDecimal('3.14159').round -> 3
- *
- * BigDecimal('8.7').round -> 9
- *
- * If n is specified and positive, the fractional part of the result has no
- * more than that many digits. 
- *
- * If n is specified and negative, at least that many digits to the left of the
- * decimal point will be 0 in the result.
- *
- * BigDecimal('3.14159').round(3) -> 3.142
- *
- * BigDecimal('13345.234').round(-2) -> 13300.0
- *
- * The value of the optional mode argument can be used to determine how 
- * rounding is performed; see BigDecimal.mode.
- */
 static VALUE
 BigDecimal_round(int argc, VALUE *argv, VALUE self)
 {
@@ -1299,7 +940,7 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
         Check_Type(vRound, T_FIXNUM);
         sw   = FIX2INT(vRound);
         if(!VpIsRoundMode(sw)) {
-            rb_raise(rb_eTypeError, "invalid rounding mode");
+            rb_raise(rb_eTypeError, "Invalid rounding mode.");
             return Qnil;
         }
         break;
@@ -1314,25 +955,6 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
     return ToValue(c);
 }
 
-/* call-seq:
- * truncate(n)
- *
- * Truncate to the nearest 1, returning the result as a BigDecimal.
- *
- * BigDecimal('3.14159').truncate -> 3
- *
- * BigDecimal('8.7').truncate -> 8
- *
- * If n is specified and positive, the fractional part of the result has no
- * more than that many digits. 
- *
- * If n is specified and negative, at least that many digits to the left of the
- * decimal point will be 0 in the result.
- *
- * BigDecimal('3.14159').truncate(3) -> 3.141
- *
- * BigDecimal('13345.234').truncate(-2) -> 13300.0
- */
 static VALUE
 BigDecimal_truncate(int argc, VALUE *argv, VALUE self)
 {
@@ -1358,8 +980,6 @@ BigDecimal_truncate(int argc, VALUE *argv, VALUE self)
     return ToValue(c);
 }
 
-/* Return the fractional part of the number.
- */
 static VALUE
 BigDecimal_frac(VALUE self)
 {
@@ -1374,25 +994,6 @@ BigDecimal_frac(VALUE self)
     return ToValue(c);
 }
 
-/* call-seq:
- * floor(n)
- *
- * Return the largest integer less than or equal to the value, as a BigDecimal.
- *
- * BigDecimal('3.14159').floor -> 3
- *
- * BigDecimal('-9.1').floor -> -10
- *
- * If n is specified and positive, the fractional part of the result has no
- * more than that many digits.  
- *
- * If n is specified and negative, at least that
- * many digits to the left of the decimal point will be 0 in the result.
- *
- * BigDecimal('3.14159').floor(3) -> 3.141
- *
- * BigDecimal('13345.234').floor(-2) -> 13300.0
- */
 static VALUE
 BigDecimal_floor(int argc, VALUE *argv, VALUE self)
 {
@@ -1418,25 +1019,6 @@ BigDecimal_floor(int argc, VALUE *argv, VALUE self)
     return ToValue(c);
 }
 
-/* call-seq:
- * ceil(n)
- *
- * Return the smallest integer greater than or equal to the value, as a BigDecimal.
- *
- * BigDecimal('3.14159').ceil -> 4
- *
- * BigDecimal('-9.1').ceil -> -9
- *
- * If n is specified and positive, the fractional part of the result has no
- * more than that many digits.  
- *
- * If n is specified and negative, at least that
- * many digits to the left of the decimal point will be 0 in the result.
- *
- * BigDecimal('3.14159').ceil(3) -> 3.142
- *
- * BigDecimal('13345.234').ceil(-2) -> 13400.0
- */
 static VALUE
 BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
 {
@@ -1462,36 +1044,6 @@ BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
     return ToValue(c);
 }
 
-/* call-seq:
- * to_s(s)
- *
- * Converts the value to a string.
- *
- * The default format looks like  0.xxxxEnn.
- *
- * The optional parameter s consists of either an integer; or an optional '+'
- * or ' ', followed by an optional number, followed by an optional 'E' or 'F'.
- *
- * If there is a '+' at the start of s, positive values are returned with
- * a leading '+'.
- *
- * A space at the start of s returns positive values with a leading space.
- *
- * If s contains a number, a space is inserted after each group of that many 
- * fractional digits.
- *
- * If s ends with an 'E', engineering notation (0.xxxxEnn) is used.
- *
- * If s ends with an 'F', conventional floating point notation is used.
- *
- * Examples:
- *
- * BigDecimal.new('-123.45678901234567890').to_s('5F') -> '-123.45678 90123 45678 9'
- *
- * BigDecimal.new('123.45678901234567890').to_s('+8F') -> '+123.45678901 23456789'
- *
- * BigDecimal.new('123.45678901234567890').to_s(' F') -> ' 123.4567890123456789'
- */
 static VALUE
 BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
 {
@@ -1545,30 +1097,6 @@ BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
     return rb_str_new2(psz);
 }
 
-/* Splits a BigDecimal number into four parts, returned as an array of values.
- *
- * The first value represents the sign of the BigDecimal, and is -1 or 1, or 0
- * if the BigDecimal is Not a Number.
- *
- * The second value is a string representing the significant digits of the
- * BigDecimal, with no leading zeros.
- *
- * The third value is the base used for arithmetic (currently always 10) as an
- * Integer.
- *
- * The fourth value is an Integer exponent.
- *
- * If the BigDecimal can be represented as 0.xxxxxx*10**n, then xxxxxx is the 
- * string of significant digits with no leading zeros, and n is the exponent.
- *
- * From these values, you can translate a BigDecimal to a float as follows:
- *
- *   sign, significant_digits, base, exponent = a.split
- *   f = sign * "0.#{significant_digits}".to_f * (base ** exponent)
- *
- * (Note that the to_f method is provided as a more convenient way to translate 
- * a BigDecimal to a Float.)
- */
 static VALUE
 BigDecimal_split(VALUE self)
 {
@@ -1597,11 +1125,6 @@ BigDecimal_split(VALUE self)
     return obj;
 }
 
-/* Returns the exponent of the BigDecimal number, as an Integer.
- *
- * If the number can be represented as 0.xxxxxx*10**n where xxxxxx is a string
- * of digits with no leading zeros, then n is the exponent.
- */
 static VALUE
 BigDecimal_exponent(VALUE self)
 {
@@ -1609,16 +1132,6 @@ BigDecimal_exponent(VALUE self)
     return INT2NUM(e);
 }
 
-/* Returns debugging information about the value as a string of comma-separated
- * values in angle brackets with a leading #:
- *
- * BigDecimal.new("1234.5678").inspect ->
- * "#<BigDecimal:b7ea1130,'0.12345678E4',8(12)>"
- *
- * The first part is the address, the second is the value as a string, and
- * the final part ss(mm) is the current number of significant digits and the
- * maximum number of significant digits, respectively.
- */
 static VALUE
 BigDecimal_inspect(VALUE self)
 {
@@ -1641,13 +1154,6 @@ BigDecimal_inspect(VALUE self)
     return obj;
 }
 
-/* call-seq:
- * power(n)
- *
- * Returns the value raised to the power of n. Note that n must be an Integer.
- *
- * Also available as the operator **
- */
 static VALUE
 BigDecimal_power(VALUE self, VALUE p)
 {
@@ -1691,18 +1197,6 @@ BigDecimal_global_new(int argc, VALUE *argv, VALUE self)
     return ToValue(pv);
 }
 
- /* call-seq:
-  * new(initial, digits)
-  *
-  * Create a new BigDecimal object.
-  *
-  * initial:: The initial value, as a String. Spaces are ignored, unrecognized characters terminate the value.
-  *
-  * digits:: The number of significant digits, as a Fixnum. If omitted or 0, the number of significant digits is determined from the initial value.
-  *
-  * The actual number of significant digits used in computation is usually
-  * larger than the specified number.
-  */
 static VALUE
 BigDecimal_new(int argc, VALUE *argv, VALUE self)
 {
@@ -1722,18 +1216,6 @@ BigDecimal_new(int argc, VALUE *argv, VALUE self)
     return ToValue(pv);
 }
 
- /* call-seq:
-  * BigDecimal.limit(digits)
-  *
-  * Limit the number of significant digits in newly created BigDecimal 
-  * numbers to the specified value. Rounding is performed as necessary, 
-  * as specified by BigDecimal.mode.
-  *
-  * A limit of 0, the default, means no upper limit.
-  *
-  * The limit specified by this method takes priority over any limit 
-  * specified to instance methods such as ceil, floor, truncate, or round.
-  */
 static VALUE
 BigDecimal_limit(int argc, VALUE *argv, VALUE self)
 {
@@ -1753,22 +1235,6 @@ BigDecimal_limit(int argc, VALUE *argv, VALUE self)
     return nCur;
 }
 
-/* Returns the sign of the value.
- *
- * Returns a positive value if > 0, a negative value if < 0, and a 
- * zero if == 0.
- *
- * The specific value returned indicates the type and sign of the BigDecimal, 
- * as follows:
- *
- * BigDecimal::SIGN_NaN:: value is Not a Number
- * BigDecimal::SIGN_POSITIVE_ZERO:: value is +0
- * BigDecimal::SIGN_NEGATIVE_ZERO:: value is -0
- * BigDecimal::SIGN_POSITIVE_INFINITE:: value is +infinity
- * BigDecimal::SIGN_NEGATIVE_INFINITE:: value is -infinity
- * BigDecimal::SIGN_POSITIVE_FINITE:: value is positive
- * BigDecimal::SIGN_NEGATIVE_FINITE:: value is negative
- */
 static VALUE
 BigDecimal_sign(VALUE self)
 { /* sign */
@@ -1798,94 +1264,37 @@ Init_bigdecimal(void)
     rb_define_singleton_method(rb_cBigDecimal, "ver", BigDecimal_version, 0);
 
     /* Constants definition */
-
-    /* 
-     * Base value used in internal calculations.  On a 32 bit system, BASE 
-     * is 10000, indicating that calculation is done in groups of 4 digits.  
-     * (If it were larger, BASE**2 wouldn't fit in 32 bits, so you couldn't
-     * guarantee that two groups could always be multiplied together without 
-     * overflow.) 
-     */
     rb_define_const(rb_cBigDecimal, "BASE", INT2FIX((S_INT)VpBaseVal()));
 
     /* Exceptions */
-
-    /*
-     * Determines whether overflow, underflow or zero divide result in 
-     * an exception being thrown. See BigDecimal.mode.
-     */
     rb_define_const(rb_cBigDecimal, "EXCEPTION_ALL",INT2FIX(VP_EXCEPTION_ALL));
-
-    /* 
-     * Determines what happens when the result of a computation is not a 
-     * number (NaN). See BigDecimal.mode. 
-     */
     rb_define_const(rb_cBigDecimal, "EXCEPTION_NaN",INT2FIX(VP_EXCEPTION_NaN));
-
-    /* 
-     * Determines what happens when the result of a computation is infinity.
-     * See BigDecimal.mode.
-     */
     rb_define_const(rb_cBigDecimal, "EXCEPTION_INFINITY",INT2FIX(VP_EXCEPTION_INFINITY));
-
-    /* 
-     * Determines what happens when the result of a computation is an underflow
-     * (a result too small to be represented). See BigDecimal.mode.
-     */
     rb_define_const(rb_cBigDecimal, "EXCEPTION_UNDERFLOW",INT2FIX(VP_EXCEPTION_UNDERFLOW));
-
-    /* 
-     * Determines what happens when the result of a computation is an underflow
-     * (a result too large to be represented). See BigDecimal.mode.
-     */
     rb_define_const(rb_cBigDecimal, "EXCEPTION_OVERFLOW",INT2FIX(VP_EXCEPTION_OVERFLOW));
-
-    /* 
-     * Determines what happens when a division by zero is performed.
-     * See BigDecimal.mode.
-     */
     rb_define_const(rb_cBigDecimal, "EXCEPTION_ZERODIVIDE",INT2FIX(VP_EXCEPTION_ZERODIVIDE));
 
-    /* 
-     * Determines what happens when a result must be rounded in order to
-     * fit in the appropriate number of significant digits. See 
-     * BigDecimal.mode.
-     */
+    /* Computation mode */
     rb_define_const(rb_cBigDecimal, "ROUND_MODE",INT2FIX(VP_ROUND_MODE));
-
-    /* Indicates that values should be rounded away from zero. See BigDecimal.mode. */
     rb_define_const(rb_cBigDecimal, "ROUND_UP",INT2FIX(VP_ROUND_UP));
-    /* Indicates that values should be rounded towards zero. See BigDecimal.mode. */
     rb_define_const(rb_cBigDecimal, "ROUND_DOWN",INT2FIX(VP_ROUND_DOWN));
-    /* Indicates that digits >= 5 should be rounded up, others rounded down. See BigDecimal.mode. */
     rb_define_const(rb_cBigDecimal, "ROUND_HALF_UP",INT2FIX(VP_ROUND_HALF_UP));
-    /* Indicates that digits >= 6 should be rounded up, others rounded down. See BigDecimal.mode. */
     rb_define_const(rb_cBigDecimal, "ROUND_HALF_DOWN",INT2FIX(VP_ROUND_HALF_DOWN));
-    /* Round towards +infinity. See BigDecimal.mode. */
     rb_define_const(rb_cBigDecimal, "ROUND_CEILING",INT2FIX(VP_ROUND_CEIL));
-    /* Round towards -infinity. See BigDecimal.mode. */
     rb_define_const(rb_cBigDecimal, "ROUND_FLOOR",INT2FIX(VP_ROUND_FLOOR));
-    /* Round towards the even neighbor. See BigDecimal.mode. */
     rb_define_const(rb_cBigDecimal, "ROUND_HALF_EVEN",INT2FIX(VP_ROUND_HALF_EVEN));
 
-    /* Indicates that a value is not a number. See BigDecimal.sign. */
+    /* Constants for sign value */
     rb_define_const(rb_cBigDecimal, "SIGN_NaN",INT2FIX(VP_SIGN_NaN));
-    /* Indicates that a value is +0. See BigDecimal.sign. */
     rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_ZERO",INT2FIX(VP_SIGN_POSITIVE_ZERO));
-    /* Indicates that a value is -0. See BigDecimal.sign. */
     rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_ZERO",INT2FIX(VP_SIGN_NEGATIVE_ZERO));
-    /* Indicates that a value is positive and finite. See BigDecimal.sign. */
     rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_FINITE",INT2FIX(VP_SIGN_POSITIVE_FINITE));
-    /* Indicates that a value is negative and finite. See BigDecimal.sign. */
     rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_FINITE",INT2FIX(VP_SIGN_NEGATIVE_FINITE));
-    /* Indicates that a value is positive and infinite. See BigDecimal.sign. */
     rb_define_const(rb_cBigDecimal, "SIGN_POSITIVE_INFINITE",INT2FIX(VP_SIGN_POSITIVE_INFINITE));
-    /* Indicates that a value is negative and infinite. See BigDecimal.sign. */
     rb_define_const(rb_cBigDecimal, "SIGN_NEGATIVE_INFINITE",INT2FIX(VP_SIGN_NEGATIVE_INFINITE));
 
     /* instance methods */
     rb_define_method(rb_cBigDecimal, "precs", BigDecimal_prec, 0);
-
     rb_define_method(rb_cBigDecimal, "add", BigDecimal_add2, 2);
     rb_define_method(rb_cBigDecimal, "sub", BigDecimal_sub2, 2);
     rb_define_method(rb_cBigDecimal, "mult", BigDecimal_mult2, 2);
@@ -2496,25 +1905,14 @@ VpAlloc(U_LONG mx, char *szVal)
        return vp;
     }
 
-    /* Skip all '_' after digit: 2006-6-30 */
-    ni = 0;
+    /* Skip all spaces */
     psz = ALLOCA_N(char,strlen(szVal)+1);
     i   = 0;
     ipn = 0;
     while(psz[i]=szVal[ipn]) {
-        if(ISDIGIT(psz[i])) ++ni;
-        if(psz[i]=='_') {
-            if(ni>0) {ipn++;continue;}
-            psz[i]=0;
-            break;
-        }
+        if(ISSPACE(szVal[ipn])) {ipn++;continue;}
         ++i; ++ipn;
     }
-    /* Skip trailing spaces */
-    while((--i)>0) {
-        if(ISSPACE(psz[i])) psz[i] = 0;
-        else                break;
-    }
     szVal = psz;
 
     /* Check on Inf & NaN */
@@ -3906,7 +3304,7 @@ VpCtoV(Real *a, char *int_chr, U_LONG ni, char *frac, U_LONG nf, char *exp_chr,
             es = e*((S_INT)BASE_FIG);
             e = e * 10 + exp_chr[i] - '0';
             if(es>e*((S_INT)BASE_FIG)) {
-                return VpException(VP_EXCEPTION_INFINITY,"exponent overflow",0);
+                return VpException(VP_EXCEPTION_INFINITY,"Exponent overflow",0);
             }
             ++i;
         }
@@ -3915,7 +3313,7 @@ VpCtoV(Real *a, char *int_chr, U_LONG ni, char *frac, U_LONG nf, char *exp_chr,
     /* get integer part */
     i = 0;
     sign = 1;
-    if(ni >= 0) {
+    if(ni > 0) {
         if(int_chr[0] == '-') {
             sign = -1;
             ++i;
@@ -4325,45 +3723,28 @@ VpMidRound(Real *y, int f, int nf)
  *   nf: digit location to round from the the decimal point.
  */
 {
-    /* fracf: any positive digit under rounding position? */
-    /* exptoadd: number of digits needed to compensate negative nf */
-    int n,i,ix,ioffset,fracf,exptoadd;
-    U_LONG v,shifter;
+    int n,i,ix,ioffset;
+    U_LONG v;
     U_LONG div;
 
     nf += y->exponent*((int)BASE_FIG);
-    exptoadd=0;
-    if (nf < 0) {
-        exptoadd = -nf;
-        nf = 0;
-    }
     /* ix: x->fraq[ix] contains round position */
     ix = nf/(int)BASE_FIG;
-    if(((U_LONG)ix)>=y->Prec) return 0; /* Unable to round */
+    if(ix<0 || ((U_LONG)ix)>=y->Prec) return 0; /* Unable to round */
     ioffset = nf - ix*((int)BASE_FIG);
 
+    memset(y->frac+ix+1, 0, (y->Prec - (ix+1)) * sizeof(U_LONG));
     v = y->frac[ix];
     /* drop digits after pointed digit */
     n = BASE_FIG - ioffset - 1;
-    for(shifter=1,i=0;i<n;++i) shifter *= 10;
-    fracf = (v%(shifter*10) > 0);
-    v /= shifter;
+    for(i=0;i<n;++i) v /= 10;
     div = v/10;
     v = v - div*10;
-    if (fracf == 0) {
-        for(i=ix+1;i<y->Prec;i++) {
-            if (y->frac[i]%BASE) {
-                fracf = 1;
-                break;
-            }
-        }
-    }
-    memset(y->frac+ix+1, 0, (y->Prec - (ix+1)) * sizeof(U_LONG));
     switch(f) {
     case VP_ROUND_DOWN: /* Truncate */
          break;
     case VP_ROUND_UP:   /* Roundup */
-        if(fracf) ++div;
+        if(v) ++div;
          break;
     case VP_ROUND_HALF_UP:   /* Round half up  */
         if(v>=5) ++div;
@@ -4372,10 +3753,10 @@ VpMidRound(Real *y, int f, int nf)
         if(v>=6) ++div;
         break;
     case VP_ROUND_CEIL: /* ceil */
-        if(fracf && (VpGetSign(y)>0)) ++div;
+        if(v && (VpGetSign(y)>0)) ++div;
         break;
     case VP_ROUND_FLOOR: /* floor */
-        if(fracf && (VpGetSign(y)<0)) ++div;
+        if(v && (VpGetSign(y)<0)) ++div;
         break;
     case VP_ROUND_HALF_EVEN: /* Banker's rounding */
         if(v>5) ++div;
@@ -4395,26 +3776,13 @@ VpMidRound(Real *y, int f, int nf)
             VpRdup(y,ix);
         } else {
             S_INT s = VpGetSign(y);
-            int e = y->exponent;
             VpSetOne(y);
             VpSetSign(y,s);
-            y->exponent = e+1;
         }
     } else {
         y->frac[ix] = div;
         VpNmlz(y);
     }
-    if (exptoadd > 0) {
-        y->exponent += exptoadd/BASE_FIG;
-        exptoadd %= BASE_FIG;
-        for(i=0;i<exptoadd;i++) {
-            y->frac[0] *= 10;
-            if (y->frac[0] >= BASE) {
-                y->frac[0] /= BASE;
-                y->exponent++;
-            }
-        }
-    }
     return 1;
 }
 
diff --git a/ext/bigdecimal/lib/bigdecimal/jacobian.rb b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
index d80eeab901..34a60ae67a 100644
--- a/ext/bigdecimal/lib/bigdecimal/jacobian.rb
+++ b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
@@ -1,27 +1,9 @@
 #
-# require 'bigdecimal/jacobian'
+# jacobian.rb
 #
-# Provides methods to compute the Jacobian matrix of a set of equations at a
-# point x. In the methods below:
-#
-# f is an Object which is used to compute the Jacobian matrix of the equations.
-# It must provide the following methods:
-#
-# f.values(x):: returns the values of all functions at x
-#
-# f.zero:: returns 0.0
-# f.one:: returns 1.0
-# f.two:: returns 1.0
-# f.ten:: returns 10.0
-#
-# f.eps:: returns the convergence criterion (epsilon value) used to determine whether two values are considered equal. If |a-b| < epsilon, the two values are considered equal.
-#
-# x is the point at which to compute the Jacobian.
-#
-# fx is f.values(x).
+# Computes Jacobian matrix of f at x
 #
 module Jacobian
-  #--
   def isEqual(a,b,zero=0.0,e=1.0e-8)
     aa = a.abs
     bb = b.abs
@@ -35,10 +17,7 @@ module Jacobian
           end
     end
   end
-  #++
 
-  # Computes the derivative of f[i] at x[i].
-  # fx is the value of f at x.
   def dfdxi(f,fx,x,i)
     nRetry = 0
     n = x.size
@@ -70,7 +49,6 @@ module Jacobian
     deriv
   end
 
-  # Computes the Jacobian of f at x. fx is the value of f at x.
   def jacobian(f,fx,x)
     n = x.size
     dfdx = Array::new(n*n)
diff --git a/ext/bigdecimal/lib/bigdecimal/ludcmp.rb b/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
index 8f4888725e..1d5d3170cc 100644
--- a/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
+++ b/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
@@ -1,8 +1,7 @@
 #
-# Solves a*x = b for x, using LU decomposition.
+# ludcmp.rb
 #
 module LUSolve
-  # Performs LU decomposition of the n by n matrix a.
   def ludecomp(a,n,zero=0,one=1)
     prec = BigDecimal.limit(nil)
     ps     = []
@@ -53,12 +52,6 @@ module LUSolve
     ps
   end
 
-  # Solves a*x = b for x, using LU decomposition.
-  #
-  # a is a matrix, b is a constant vector, x is the solution vector.
-  #
-  # ps is the pivot, a vector which indicates the permutation of rows performed
-  # during LU decomposition.
   def lusolve(a,b,ps,zero=0.0)
     prec = BigDecimal.limit(nil)
     n = ps.size
diff --git a/ext/bigdecimal/lib/bigdecimal/math.rb b/ext/bigdecimal/lib/bigdecimal/math.rb
index f3248a3c5c..7b3f46ed1a 100644
--- a/ext/bigdecimal/lib/bigdecimal/math.rb
+++ b/ext/bigdecimal/lib/bigdecimal/math.rb
@@ -1,5 +1,4 @@
 #
-#--
 # Contents:
 #   sqrt(x, prec)
 #   sin (x, prec)
@@ -14,35 +13,19 @@
 #   x    ... BigDecimal number to be computed.
 #            |x| must be small enough to get convergence.
 #   prec ... Number of digits to be obtained.
-#++
-#
-# Provides mathematical functions.
-#
-# Example:
 #
+# Usage:
 #   require "bigdecimal"
-#   require "bigdecimal/math"
-#
+#   require "bigdecimal/math.rb"
 #   include BigMath
-#
 #   a = BigDecimal((PI(100)/2).to_s)
-#   puts sin(a,100) # -> 0.10000000000000000000......E1
+#   puts sin(a,100) # => 0.10000000000000000000......E1
 #
 module BigMath
-
-  # Computes the square root of x to the specified number of digits of 
-  # precision.
-  #
-  # BigDecimal.new('2').sqrt(16).to_s 
-  #  -> "0.14142135623730950488016887242096975E1"
-  #
   def sqrt(x,prec)
     x.sqrt(prec)
   end
 
-  # Computes the sine of x to the specified number of digits of precision.
-  #
-  # If x is infinite or NaN, returns NaN.
   def sin(x, prec)
     raise ArgumentError, "Zero or negative precision for sin" if prec <= 0
     return BigDecimal("NaN") if x.infinite? || x.nan?
@@ -68,9 +51,6 @@ module BigMath
     y
   end
 
-  # Computes the cosine of x to the specified number of digits of precision.
-  #
-  # If x is infinite or NaN, returns NaN.
   def cos(x, prec)
     raise ArgumentError, "Zero or negative precision for cos" if prec <= 0
     return BigDecimal("NaN") if x.infinite? || x.nan?
@@ -96,10 +76,6 @@ module BigMath
     y
   end
 
-  # Computes the arctangent of x to the specified number of digits of precision.
-  #
-  # If x is infinite or NaN, returns NaN.
-  # Raises an argument error if x > 1.
   def atan(x, prec)
     raise ArgumentError, "Zero or negative precision for atan" if prec <= 0
     return BigDecimal("NaN") if x.infinite? || x.nan?
@@ -120,13 +96,6 @@ module BigMath
     y
   end
 
-  # Computes the value of e (the base of natural logarithms) raised to the 
-  # power of x, to the specified number of digits of precision.
-  #
-  # If x is infinite or NaN, returns NaN.
-  #
-  # BigMath::exp(BigDecimal.new('1'), 10).to_s
-  # -> "0.271828182845904523536028752390026306410273E1"
   def exp(x, prec)
     raise ArgumentError, "Zero or negative precision for exp" if prec <= 0
     return BigDecimal("NaN") if x.infinite? || x.nan?
@@ -148,11 +117,6 @@ module BigMath
     y
   end
 
-  # Computes the natural logarithm of x to the specified number of digits 
-  # of precision.
-  #
-  # Returns x if x is infinite or NaN.
-  #
   def log(x, prec)
     raise ArgumentError, "Zero or negative argument for log" if x <= 0 || prec <= 0
     return x if x.infinite? || x.nan?
@@ -174,7 +138,6 @@ module BigMath
     y*two
   end
 
-  # Computes the value of pi to the specified number of digits of precision.
   def PI(prec)
     raise ArgumentError, "Zero or negative argument for PI" if prec <= 0
     n      = prec + BigDecimal.double_fig
@@ -213,8 +176,6 @@ module BigMath
     pi
   end
 
-  # Computes e (the base of natural logarithms) to the specified number of
-  # digits of precision.
   def E(prec)
     raise ArgumentError, "Zero or negative precision for E" if prec <= 0
     n    = prec + BigDecimal.double_fig
diff --git a/ext/bigdecimal/lib/bigdecimal/newton.rb b/ext/bigdecimal/lib/bigdecimal/newton.rb
index 59ac0f7f04..67a92474ac 100644
--- a/ext/bigdecimal/lib/bigdecimal/newton.rb
+++ b/ext/bigdecimal/lib/bigdecimal/newton.rb
@@ -1,29 +1,27 @@
 #
 # newton.rb 
 #
-# Solves the nonlinear algebraic equation system f = 0 by Newton's method.
-# This program is not dependent on BigDecimal.
+# Solves nonlinear algebraic equation system f = 0 by Newton's method.
+#  (This program is not dependent on BigDecimal)
 #
 # To call:
 #    n = nlsolve(f,x)
-#  where n is the number of iterations required,
-#        x is the initial value vector
-#        f is an Object which is used to compute the values of the equations to be solved.
-# It must provide the following methods:
+#  where n is the number of iterations required.
+#        x is the solution vector.
+#        f is the object to be solved which must have following methods.
 #
-# f.values(x):: returns the values of all functions at x
+#   f ... Object to compute Jacobian matrix of the equation systems.
+#       [Methods required for f]
+#         f.values(x) returns values of all functions at x.
+#         f.zero      returns 0.0
+#         f.one       returns 1.0
+#         f.two       returns 1.0
+#         f.ten       returns 10.0
+#         f.eps       convergence criterion
+#   x ... initial values
 #
-# f.zero:: returns 0.0
-# f.one:: returns 1.0
-# f.two:: returns 1.0
-# f.ten:: returns 10.0
-#
-# f.eps:: returns the convergence criterion (epsilon value) used to determine whether two values are considered equal. If |a-b| < epsilon, the two values are considered equal.
-#
-# On exit, x is the solution vector.
-#
-require "bigdecimal/ludcmp"
-require "bigdecimal/jacobian"
+require "ludcmp"
+require "jacobian"
 
 module Newton
   include LUSolve
@@ -62,7 +60,7 @@ module Newton
       begin
         fact *= p5
         if fact < minfact then
-          raise "Failed to reduce function values."
+          raize "Failed to reduce function values."
         end
         for i in 0...n do
           x[i] = xs[i] - dx[i]*fact
diff --git a/ext/bigdecimal/lib/bigdecimal/nlsolve.rb b/ext/bigdecimal/lib/bigdecimal/nlsolve.rb
new file mode 100644
index 0000000000..08f17f9ecd
--- /dev/null
+++ b/ext/bigdecimal/lib/bigdecimal/nlsolve.rb
@@ -0,0 +1,38 @@
+#!/usr/local/bin/ruby
+
+#
+# nlsolve.rb
+# An example for solving nonlinear algebraic equation system.
+#
+
+require "bigdecimal"
+require "newton"
+include Newton
+
+class Function
+  def initialize()
+    @zero = BigDecimal::new("0.0")
+    @one  = BigDecimal::new("1.0")
+    @two  = BigDecimal::new("2.0")
+    @ten  = BigDecimal::new("10.0")
+    @eps  = BigDecimal::new("1.0e-16")
+  end
+  def zero;@zero;end
+  def one ;@one ;end
+  def two ;@two ;end
+  def ten ;@ten ;end
+  def eps ;@eps ;end
+  def values(x) # <= defines functions solved
+    f = []
+    f1 = x[0]*x[0] + x[1]*x[1] - @two # f1 = x**2 + y**2 - 2 => 0
+    f2 = x[0] - x[1]                  # f2 = x    - y        => 0
+    f <<= f1
+    f <<= f2
+    f
+  end
+end
+ f = BigDecimal::limit(100)
+ f = Function.new
+ x = [f.zero,f.zero]      # Initial values
+ n = nlsolve(f,x)
+ p x
diff --git a/ext/bigdecimal/lib/bigdecimal/util.rb b/ext/bigdecimal/lib/bigdecimal/util.rb
index 09e926acd5..1f8d6c7a49 100644
--- a/ext/bigdecimal/lib/bigdecimal/util.rb
+++ b/ext/bigdecimal/lib/bigdecimal/util.rb
@@ -1,17 +1,19 @@
 #
 # BigDecimal utility library.
+# ----------------------------------------------------------------------
+# Contents:
 #
-# To use these functions, require 'bigdecimal/util'
-#
-# The following methods are provided to convert other types to BigDecimals:
+#   String#
+#     to_d      ... to BigDecimal
 #
-#   String#to_d -> BigDecimal
-#   Float#to_d -> BigDecimal
-#   Rational#to_d -> BigDecimal
+#   Float#
+#     to_d      ... to BigDecimal
 #
-# The following method is provided to convert BigDecimals to other types:
+#   BigDecimal#
+#     to_r      ... to Rational
 #
-#   BigDecimal#to_r -> Rational
+#   Rational#
+#     to_d      ... to BigDecimal
 #
 # ----------------------------------------------------------------------
 #
@@ -28,8 +30,8 @@ class String
 end
 
 class BigDecimal < Numeric
-  # Converts a BigDecimal to a String of the form "nnnnnn.mmm".
-  # This method is deprecated; use BigDecimal#to_s("F") instead.
+  # to "nnnnnn.mmm" form digit string
+  # Use BigDecimal#to_s("F") instead.
   def to_digits
      if self.nan? || self.infinite? || self.zero?
         self.to_s
@@ -40,21 +42,22 @@ class BigDecimal < Numeric
      end
   end
 
-  # Converts a BigDecimal to a Rational.
+  # Convert BigDecimal to Rational
   def to_r 
      sign,digits,base,power = self.split
      numerator = sign*digits.to_i
      denomi_power = power - digits.size # base is always 10
      if denomi_power < 0
-        Rational(numerator,base ** (-denomi_power))
+        denominator = base ** (-denomi_power)
      else
-        Rational(numerator * (base ** denomi_power),1)
+        denominator = base ** denomi_power
      end
+     Rational(numerator,denominator)
   end
 end
 
 class Rational < Numeric
-  # Converts a Rational to a BigDecimal
+  # Convert Rational to BigDecimal
   def to_d(nFig=0)
      num = self.numerator.to_s
      if nFig<=0
diff --git a/ext/bigdecimal/sample/linear.rb b/ext/bigdecimal/sample/linear.rb
index 88a62ffa71..7c8ca263eb 100644
--- a/ext/bigdecimal/sample/linear.rb
+++ b/ext/bigdecimal/sample/linear.rb
@@ -11,7 +11,7 @@
 #
 
 require "bigdecimal"
-require "bigdecimal/ludcmp"
+require "ludcmp"
 
 #
 # NOTE:
diff --git a/ext/bigdecimal/sample/nlsolve.rb b/ext/bigdecimal/sample/nlsolve.rb
index 7f729e6aaa..08f17f9ecd 100644
--- a/ext/bigdecimal/sample/nlsolve.rb
+++ b/ext/bigdecimal/sample/nlsolve.rb
@@ -6,7 +6,7 @@
 #
 
 require "bigdecimal"
-require "bigdecimal/newton"
+require "newton"
 include Newton
 
 class Function
diff --git a/ext/curses/curses.c b/ext/curses/curses.c
index 4e84b0837f..106c43da4c 100644
--- a/ext/curses/curses.c
+++ b/ext/curses/curses.c
@@ -1,5 +1,5 @@
 /* -*- C -*-
- * $Id: curses.c,v 1.24.2.8 2006/07/18 05:08:34 matz Exp $
+ * $Id$
  *
  * ext/curses/curses.c
  * 
@@ -21,11 +21,7 @@
 #elif defined(HAVE_NCURSES_CURSES_H)
 # include <ncurses/curses.h>
 #elif defined(HAVE_CURSES_COLR_CURSES_H)
-# ifdef HAVE_STDARG_PROTOTYPES
-#  include <stdarg.h>
-# else
-#  include <varargs.h>
-# endif
+# include <varargs.h>
 # include <curses_colr/curses.h>
 #else
 # include <curses.h>
@@ -54,9 +50,6 @@
 # define USE_MOUSE 1
 #endif
 
-#define NUM2CH NUM2LONG
-#define CH2FIX LONG2FIX
-
 static VALUE mCurses;
 static VALUE mKey;
 static VALUE cWindow;
@@ -127,7 +120,7 @@ curses_init_screen()
     if (rb_stdscr) return rb_stdscr;
     initscr();
     if (stdscr == 0) {
-	rb_raise(rb_eRuntimeError, "can't initialize curses");
+	rb_raise(rb_eRuntimeError, "cannot initialize curses");
     }
     clear();
     rb_stdscr = prep_window(cWindow, stdscr);
@@ -186,15 +179,6 @@ curses_clear(obj)
     return Qnil;
 }
 
-/* def clrtoeol */
-static VALUE
-curses_clrtoeol()
-{
-    curses_stdscr();
-    clrtoeol();
-    return Qnil;
-}
-
 /* def refresh */
 static VALUE
 curses_refresh(obj)
@@ -374,7 +358,7 @@ curses_inch(obj)
     VALUE obj;
 {
     curses_stdscr();
-    return CH2FIX(inch());
+    return CHR2FIX(inch());
 }
 
 /* def addch(ch) */
@@ -384,7 +368,7 @@ curses_addch(obj, ch)
     VALUE ch;
 {
     curses_stdscr();
-    addch(NUM2CH(ch));
+    addch(NUM2CHR(ch));
     return Qnil;
 }
 
@@ -395,7 +379,7 @@ curses_insch(obj, ch)
     VALUE ch;
 {
     curses_stdscr();
-    insch(NUM2CH(ch));
+    insch(NUM2CHR(ch));
     return Qnil;
 }
 
@@ -458,17 +442,6 @@ curses_deleteln(obj)
     return Qnil;
 }
 
-/* def insertln */
-static VALUE
-curses_insertln(obj)
-    VALUE obj;
-{
-#if defined(HAVE_INSERTLN) || defined(insertln)
-    insertln();
-#endif
-    return Qnil;
-}
-
 /* def keyname */
 static VALUE
 curses_keyname(obj, c)
@@ -559,7 +532,7 @@ static VALUE
 curses_bkgdset(VALUE obj, VALUE ch)
 {
 #ifdef HAVE_BKGDSET
-  bkgdset(NUM2CH(ch));
+  bkgdset(NUM2CHR(ch));
 #endif
   return Qnil;
 }
@@ -568,7 +541,7 @@ static VALUE
 curses_bkgd(VALUE obj, VALUE ch)
 {
 #ifdef HAVE_BKGD
-  return (bkgd(NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
+  return (bkgd(NUM2CHR(ch)) == OK) ? Qtrue : Qfalse;
 #else
   return Qfalse;
 #endif
@@ -683,7 +656,7 @@ curses_getmouse(VALUE obj)
 
   val = Data_Make_Struct(cMouseEvent,struct mousedata,
 			 0,curses_mousedata_free,mdata);
-  mdata->mevent = (MEVENT*)xmalloc(sizeof(MEVENT));
+  mdata->mevent = (MEVENT*)malloc(sizeof(MEVENT));
   return (getmouse(mdata->mevent) == OK) ? val : Qnil;
 }
 
@@ -789,26 +762,22 @@ window_initialize(obj, h, w, top, left)
     return obj;
 }
 
-/* def subwin(height, width, top, left) */
+/* def subwin(h, w, top, left) */
 static VALUE
-window_subwin(obj, height, width, top, left)
+window_subwin(obj, h, w, top, left)
     VALUE obj;
-    VALUE height;
-    VALUE width;
+    VALUE h;
+    VALUE w;
     VALUE top;
     VALUE left;
 {
     struct windata *winp;
     WINDOW *window;
     VALUE win;
-    int h, w, t, l;
 
-    h = NUM2INT(height);
-    w = NUM2INT(width);
-    t = NUM2INT(top);
-    l = NUM2INT(left);
     GetWINDOW(obj, winp);
-    window = subwin(winp->window, h, w, t, l);
+    window = subwin(winp->window, NUM2INT(h), NUM2INT(w),
+		                  NUM2INT(top), NUM2INT(left));
     win = prep_window(rb_obj_class(obj), window);
 
     return win;
@@ -841,19 +810,6 @@ window_clear(obj)
     return Qnil;
 }
 
-/* def clrtoeol */
-static VALUE
-window_clrtoeol(obj)
-    VALUE obj;
-{
-    struct windata *winp;
-    
-    GetWINDOW(obj, winp);
-    wclrtoeol(winp->window);
-    
-    return Qnil;
-}
-
 /* def refresh */
 static VALUE
 window_refresh(obj)
@@ -1027,13 +983,13 @@ window_box(argc, argv, self)
     rb_scan_args(argc, argv, "21", &vert, &hor, &corn);
 
     GetWINDOW(self, winp);
-    box(winp->window, NUM2CH(vert), NUM2CH(hor));
+    box(winp->window, NUM2CHR(vert), NUM2CHR(hor));
 
     if (!NIL_P(corn)) {
       int cur_x, cur_y, x, y;
-      chtype c;
+      char c;
 
-      c = NUM2CH(corn);
+      c = NUM2CHR(corn);
       getyx(winp->window, cur_y, cur_x);
       x = NUM2INT(window_maxx(self)) - 1;
       y = NUM2INT(window_maxy(self)) - 1;
@@ -1083,7 +1039,7 @@ window_inch(obj)
     struct windata *winp;
     
     GetWINDOW(obj, winp);
-    return CH2FIX(winch(winp->window));
+    return CHR2FIX(winch(winp->window));
 }
 
 /* def addch(ch) */
@@ -1095,7 +1051,7 @@ window_addch(obj, ch)
     struct windata *winp;
     
     GetWINDOW(obj, winp);
-    waddch(winp->window, NUM2CH(ch));
+    waddch(winp->window, NUM2CHR(ch));
     
     return Qnil;
 }
@@ -1109,7 +1065,7 @@ window_insch(obj, ch)
     struct windata *winp;
     
     GetWINDOW(obj, winp);
-    winsch(winp->window, NUM2CH(ch));
+    winsch(winp->window, NUM2CHR(ch));
     
     return Qnil;
 }
@@ -1195,20 +1151,6 @@ window_deleteln(obj)
     return Qnil;
 }
 
-/* def insertln */
-static VALUE
-window_insertln(obj)
-    VALUE obj;
-{
-#if defined(HAVE_WINSERTLN) || defined(winsertln)
-    struct windata *winp;
-    
-    GetWINDOW(obj, winp);
-    winsertln(winp->window);
-#endif
-    return Qnil;
-}
-
 static VALUE
 window_scrollok(VALUE obj, VALUE bf)
 {
@@ -1245,20 +1187,6 @@ window_setscrreg(VALUE obj, VALUE top, VALUE bottom)
 #endif
 }
 
-#if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET)
-static VALUE
-window_color_set(VALUE obj, VALUE col) 
-{
-  struct windata *winp;
-  int res;
-
-  GetWINDOW(obj, winp);
-  res = wcolor_set(winp->window, NUM2INT(col), NULL);
-  return (res == OK) ? Qtrue : Qfalse;
-  return Qfalse;
-}
-#endif /* USE_COLOR */
-
 static VALUE
 window_scroll(VALUE obj)
 {
@@ -1338,7 +1266,7 @@ window_bkgdset(VALUE obj, VALUE ch)
   struct windata *winp;
 
   GetWINDOW(obj,winp);
-  wbkgdset(winp->window, NUM2CH(ch));
+  wbkgdset(winp->window, NUM2CHR(ch));
 #endif
   return Qnil;
 }
@@ -1350,7 +1278,7 @@ window_bkgd(VALUE obj, VALUE ch)
   struct windata *winp;
 
   GetWINDOW(obj,winp);
-  return (wbkgd(winp->window, NUM2CH(ch)) == OK) ? Qtrue : Qfalse;
+  return (wbkgd(winp->window, NUM2CHR(ch)) == OK) ? Qtrue : Qfalse;
 #else
   return Qfalse;
 #endif
@@ -1360,11 +1288,11 @@ static VALUE
 window_getbkgd(VALUE obj)
 {
 #ifdef HAVE_WGETBKGD
-  chtype c;
+  char c;
   struct windata *winp;
 
   GetWINDOW(obj,winp);
-  return (c = getbkgd(winp->window) != ERR) ? CH2FIX(c) : Qnil;
+  return (c = getbkgd(winp->window) != ERR) ? CHR2FIX(c) : Qnil;
 #else
   return Qnil;
 #endif
@@ -1464,7 +1392,6 @@ Init_curses()
     rb_define_module_function(mCurses, "refresh", curses_refresh, 0);
     rb_define_module_function(mCurses, "doupdate", curses_doupdate, 0);
     rb_define_module_function(mCurses, "clear", curses_clear, 0);
-    rb_define_module_function(mCurses, "clrtoeol", curses_clrtoeol, 0);
     rb_define_module_function(mCurses, "echo", curses_echo, 0);
     rb_define_module_function(mCurses, "noecho", curses_noecho, 0);
     rb_define_module_function(mCurses, "raw", curses_raw, 0);
@@ -1489,7 +1416,6 @@ Init_curses()
     rb_define_module_function(mCurses, "getstr", curses_getstr, 0);
     rb_define_module_function(mCurses, "delch", curses_delch, 0);
     rb_define_module_function(mCurses, "deleteln", curses_deleteln, 0);
-    rb_define_module_function(mCurses, "insertln", curses_insertln, 0);
     rb_define_module_function(mCurses, "keyname", curses_keyname, 1);
     rb_define_module_function(mCurses, "lines", curses_lines, 0);
     rb_define_module_function(mCurses, "cols", curses_cols, 0);
@@ -1532,15 +1458,11 @@ Init_curses()
     rb_define_method(cWindow, "subwin", window_subwin, 4);
     rb_define_method(cWindow, "close", window_close, 0);
     rb_define_method(cWindow, "clear", window_clear, 0);
-    rb_define_method(cWindow, "clrtoeol", window_clrtoeol, 0);
     rb_define_method(cWindow, "refresh", window_refresh, 0);
     rb_define_method(cWindow, "noutrefresh", window_noutrefresh, 0);
     rb_define_method(cWindow, "box", window_box, -1);
     rb_define_method(cWindow, "move", window_move, 2);
     rb_define_method(cWindow, "setpos", window_setpos, 2);
-#if defined(USE_COLOR) && defined(HAVE_WCOLOR_SET)
-    rb_define_method(cWindow, "color_set", window_color_set, 1);
-#endif /* USE_COLOR && HAVE_WCOLOR_SET */
     rb_define_method(cWindow, "cury", window_cury, 0);
     rb_define_method(cWindow, "curx", window_curx, 0);
     rb_define_method(cWindow, "maxy", window_maxy, 0);
@@ -1558,7 +1480,6 @@ Init_curses()
     rb_define_method(cWindow, "getstr", window_getstr, 0);
     rb_define_method(cWindow, "delch", window_delch, 0);
     rb_define_method(cWindow, "deleteln", window_deleteln, 0);
-    rb_define_method(cWindow, "insertln", window_insertln, 0);
     rb_define_method(cWindow, "scroll", window_scroll, 0);
     rb_define_method(cWindow, "scrollok", window_scrollok, 1);
     rb_define_method(cWindow, "idlok", window_idlok, 1);
diff --git a/ext/curses/extconf.rb b/ext/curses/extconf.rb
index 01fe971093..9b319ba30e 100644
--- a/ext/curses/extconf.rb
+++ b/ext/curses/extconf.rb
@@ -19,7 +19,7 @@ elsif have_header(*curses=%w"curses.h") and have_library("curses", "initscr")
 end
 
 if make
-  for f in %w(beep bkgd bkgdset curs_set deleteln doupdate flash getbkgd getnstr init isendwin keyname keypad resizeterm scrl set setscrreg ungetch wattroff wattron wattrset wbkgd wbkgdset wdeleteln wgetnstr wresize wscrl wsetscrreg def_prog_mode reset_prog_mode timeout wtimeout nodelay init_color wcolor_set)
+  for f in %w(beep bkgd bkgdset curs_set deleteln doupdate flash getbkgd getnstr init isendwin keyname keypad resizeterm scrl set setscrreg ungetch wattroff wattron wattrset wbkgd wbkgdset wdeleteln wgetnstr wresize wscrl wsetscrreg def_prog_mode reset_prog_mode timeout wtimeout nodelay init_color)
     have_func(f)
   end
   flag = "-D_XOPEN_SOURCE_EXTENDED"
diff --git a/ext/curses/view.rb b/ext/curses/view.rb
index d9a82a57db..5ba1a8413c 100644
--- a/ext/curses/view.rb
+++ b/ext/curses/view.rb
@@ -49,7 +49,7 @@ while TRUE
   n = 0
   while TRUE
     c = getch.chr
-    if c =~ /[0-9]/
+    if c =~ "[0-9]" then
       n = 10 * n + c.to_i
     else
       break
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c
index 83e6a9893b..e609327c46 100644
--- a/ext/dbm/dbm.c
+++ b/ext/dbm/dbm.c
@@ -2,8 +2,8 @@
 
   dbm.c -
 
-  $Author: usa $
-  $Date: 2005/06/20 07:53:19 $
+  $Author$
+  $Date$
   created at: Mon Jan 24 15:59:52 JST 1994
 
   Copyright (C) 1995-2001 Yukihiro Matsumoto
@@ -43,11 +43,6 @@ closed_dbm()
     if (dbmp->di_dbm == 0) closed_dbm();\
 }
 
-#define GetDBM2(obj, data, dbm) {\
-    GetDBM(obj, data);\
-    (dbm) = dbmp->di_dbm;\
-}
-
 static void
 free_dbm(dbmp)
     struct dbmdata *dbmp;
@@ -71,21 +66,6 @@ fdbm_close(obj)
     return Qnil;
 }
 
-static VALUE
-fdbm_closed(obj)
-    VALUE obj;
-{
-    struct dbmdata *dbmp;
-
-    Data_Get_Struct(obj, struct dbmdata, dbmp);
-    if (dbmp == 0)
-	return Qtrue;
-    if (dbmp->di_dbm == 0)
-	return Qtrue;
-
-    return Qfalse;
-}
-
 static VALUE fdbm_alloc _((VALUE));
 static VALUE
 fdbm_alloc(klass)
@@ -181,7 +161,8 @@ fdbm_fetch(obj, keystr, ifnone)
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     value = dbm_fetch(dbm, key);
     if (value.dptr == 0) {
 	if (ifnone == Qnil && rb_block_given_p())
@@ -226,7 +207,8 @@ fdbm_index(obj, valstr)
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
 	if (val.dsize == RSTRING(valstr)->len &&
@@ -271,18 +253,17 @@ fdbm_select(argc, argv, obj)
 	if (argc > 0) {
 	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
 	}
-        GetDBM2(obj, dbmp, dbm);
+        GetDBM(obj, dbmp);
+        dbm = dbmp->di_dbm;
+
         for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
-            VALUE assoc, v;
+            VALUE assoc;
             val = dbm_fetch(dbm, key);
             assoc = rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
                                  rb_tainted_str_new(val.dptr, val.dsize));
-	    v = rb_yield(assoc);
-	    if (RTEST(v)) {
-		rb_ary_push(new, assoc);
-	    }
-	    GetDBM2(obj, dbmp, dbm);
-	}
+            if (RTEST(rb_yield(assoc)))
+                rb_ary_push(new, assoc);
+        }
     }
     else {
 	rb_warn("DBM#select(index..) is deprecated; use DBM#values_at");
@@ -333,7 +314,9 @@ fdbm_delete(obj, keystr)
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     value = dbm_fetch(dbm, key);
     if (value.dptr == 0) {
 	if (rb_block_given_p()) return rb_yield(keystr);
@@ -363,7 +346,8 @@ fdbm_shift(obj)
     VALUE keystr, valstr;
 
     fdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     dbmp->di_size = -1;
 
     key = dbm_firstkey(dbm); 
@@ -388,7 +372,8 @@ fdbm_delete_if(obj)
     int i, status = 0, n;
 
     fdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     n = dbmp->di_size;
     dbmp->di_size = -1;
 
@@ -399,7 +384,6 @@ fdbm_delete_if(obj)
         ret = rb_protect(rb_yield, rb_assoc_new(rb_str_dup(keystr), valstr), &status);
         if (status != 0) break;
 	if (RTEST(ret)) rb_ary_push(ary, keystr);
-	GetDBM2(obj, dbmp, dbm);
     }
 
     for (i = 0; i < RARRAY(ary)->len; i++) {
@@ -426,7 +410,8 @@ fdbm_clear(obj)
     DBM *dbm;
 
     fdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     dbmp->di_size = -1;
     while (key = dbm_firstkey(dbm), key.dptr) {
 	if (dbm_delete(dbm, key)) {
@@ -448,7 +433,8 @@ fdbm_invert(obj)
     VALUE keystr, valstr;
     VALUE hash = rb_hash_new();
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
 	keystr = rb_tainted_str_new(key.dptr, key.dsize);
@@ -508,16 +494,17 @@ fdbm_store(obj, keystr, valstr)
 
     fdbm_modify(obj);
     keystr = rb_obj_as_string(keystr);
-    valstr = rb_obj_as_string(valstr);
 
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
+    valstr = rb_obj_as_string(valstr);
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
     dbmp->di_size = -1;
+    dbm = dbmp->di_dbm;
     if (dbm_store(dbm, key, val, DBM_REPLACE)) {
 #ifdef HAVE_DBM_CLEARERR
 	dbm_clearerr(dbm);
@@ -538,8 +525,9 @@ fdbm_length(obj)
     DBM *dbm;
     int i = 0;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
     if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size);
+    dbm = dbmp->di_dbm;
 
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	i++;
@@ -558,7 +546,7 @@ fdbm_empty_p(obj)
     DBM *dbm;
     int i = 0;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
     if (dbmp->di_size < 0) {
 	dbm = dbmp->di_dbm;
 
@@ -581,11 +569,11 @@ fdbm_each_value(obj)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
 	rb_yield(rb_tainted_str_new(val.dptr, val.dsize));
-	GetDBM2(obj, dbmp, dbm);
     }
     return obj;
 }
@@ -598,10 +586,10 @@ fdbm_each_key(obj)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	rb_yield(rb_tainted_str_new(key.dptr, key.dsize));
-	GetDBM2(obj, dbmp, dbm);
     }
     return obj;
 }
@@ -615,14 +603,14 @@ fdbm_each_pair(obj)
     struct dbmdata *dbmp;
     VALUE keystr, valstr;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
 
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
 	keystr = rb_tainted_str_new(key.dptr, key.dsize);
 	valstr = rb_tainted_str_new(val.dptr, val.dsize);
 	rb_yield(rb_assoc_new(keystr, valstr));
-	GetDBM2(obj, dbmp, dbm);
     }
 
     return obj;
@@ -637,7 +625,8 @@ fdbm_keys(obj)
     DBM *dbm;
     VALUE ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
 
     ary = rb_ary_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
@@ -656,7 +645,9 @@ fdbm_values(obj)
     DBM *dbm;
     VALUE ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     ary = rb_ary_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
@@ -678,7 +669,8 @@ fdbm_has_key(obj, keystr)
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     val = dbm_fetch(dbm, key);
     if (val.dptr) return Qtrue;
     return Qfalse;
@@ -696,7 +688,8 @@ fdbm_has_value(obj, valstr)
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
 	if (val.dsize == RSTRING(valstr)->len &&
@@ -715,12 +708,14 @@ fdbm_to_a(obj)
     DBM *dbm;
     VALUE ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     ary = rb_ary_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
 	rb_ary_push(ary, rb_assoc_new(rb_tainted_str_new(key.dptr, key.dsize),
-				      rb_tainted_str_new(val.dptr, val.dsize)));
+				rb_tainted_str_new(val.dptr, val.dsize)));
     }
 
     return ary;
@@ -735,7 +730,9 @@ fdbm_to_hash(obj)
     DBM *dbm;
     VALUE hash;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     hash = rb_hash_new();
     for (key = dbm_firstkey(dbm); key.dptr; key = dbm_nextkey(dbm)) {
 	val = dbm_fetch(dbm, key);
@@ -765,7 +762,6 @@ Init_dbm()
 
     rb_define_method(rb_cDBM, "initialize", fdbm_initialize, -1);
     rb_define_method(rb_cDBM, "close", fdbm_close, 0);
-    rb_define_method(rb_cDBM, "closed?", fdbm_closed, 0);
     rb_define_method(rb_cDBM, "[]", fdbm_aref, 1);
     rb_define_method(rb_cDBM, "fetch", fdbm_fetch_m, -1);
     rb_define_method(rb_cDBM, "[]=", fdbm_store, 2);
@@ -773,7 +769,7 @@ Init_dbm()
     rb_define_method(rb_cDBM, "index",  fdbm_index, 1);
     rb_define_method(rb_cDBM, "indexes",  fdbm_indexes, -1);
     rb_define_method(rb_cDBM, "indices",  fdbm_indexes, -1);
-    rb_define_method(rb_cDBM, "select",  fdbm_select, -1);
+    rb_define_method(rb_cDBM, "select",  fdbm_select, 0);
     rb_define_method(rb_cDBM, "values_at", fdbm_values_at, -1);
     rb_define_method(rb_cDBM, "length", fdbm_length, 0);
     rb_define_method(rb_cDBM, "size", fdbm_length, 0);
diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
index 52ec688952..5a67603e69 100644
--- a/ext/dbm/extconf.rb
+++ b/ext/dbm/extconf.rb
@@ -33,7 +33,7 @@ def db_check(db)
   if have_library(db, db_prefix("dbm_open")) || have_func(db_prefix("dbm_open"))
     for hdr in $dbm_conf_headers.fetch(db, ["ndbm.h"])
       if have_header(hdr.dup) and have_type("DBM", hdr.dup, hsearch)
-	$defs << hsearch << '-DDBM_HDR="<'+hdr+'>"'
+	$CFLAGS += " " + hsearch + '-DDBM_HDR="<'+hdr+'>"'
 	return true
       end
     end
@@ -46,16 +46,16 @@ def db_prefix(func)
 end
 
 if dblib
-  dbm_hdr = db_check(dblib)
+  db_check(dblib)
 else
-  dbm_hdr = %w(db db2 db1 dbm gdbm gdbm_compat qdbm).any? do |dblib|
-    db_check(dblib)
+  for dblib in %w(db db2 db1 dbm gdbm gdbm_compat qdbm)
+    db_check(dblib) and break
   end
 end
 
 have_header("cdefs.h") 
 have_header("sys/cdefs.h") 
-if dbm_hdr and have_func(db_prefix("dbm_open"))
+if /DBM_HDR/ =~ $CFLAGS and have_func(db_prefix("dbm_open"))
   have_func(db_prefix("dbm_clearerr")) unless $dbm_conf_have_gdbm
   create_makefile("dbm")
 end
diff --git a/ext/dbm/testdbm.rb b/ext/dbm/testdbm.rb
new file mode 100644
index 0000000000..4942ffb64a
--- /dev/null
+++ b/ext/dbm/testdbm.rb
@@ -0,0 +1,593 @@
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+
+if $".grep(/\bdbm.so\b/).empty?
+  begin
+    require './dbm'
+  rescue LoadError
+    require 'dbm'
+  end
+end
+
+def uname_s
+  require 'rbconfig'
+  case Config::CONFIG['host_os']
+  when 'cygwin'
+    require 'Win32API'
+    uname = Win32API.new('cygwin1', 'uname', 'P', 'I')
+    utsname = ' ' * 100
+    raise 'cannot get system name' if uname.call(utsname) == -1
+
+    utsname.unpack('A20' * 5)[0]
+  else
+    Config::CONFIG['host_os']
+  end
+end
+
+SYSTEM = uname_s
+
+class TestDBM < RUNIT::TestCase
+  def setup
+    @path = "tmptest_dbm_"
+    assert_instance_of(DBM, @dbm = DBM.new(@path))
+
+    # prepare to make readonly DBM file
+    DBM.open("tmptest_dbm_rdonly") {|dbm|
+      dbm['foo'] = 'FOO'
+    }
+    
+    File.chmod(0400, *Dir.glob("tmptest_dbm_rdonly.*"))
+
+    assert_instance_of(DBM, @dbm_rdonly = DBM.new("tmptest_dbm_rdonly", nil))
+  end
+  def teardown
+    assert_nil(@dbm.close)
+    assert_nil(@dbm_rdonly.close)
+    GC.start
+    File.delete *Dir.glob("tmptest_dbm*").to_a
+    p Dir.glob("tmptest_dbm*") if $DEBUG
+  end
+
+  def check_size(expect, dbm=@dbm)
+    assert_equals(expect, dbm.size)
+    n = 0
+    dbm.each { n+=1 }
+    assert_equals(expect, n)
+    if expect == 0
+      assert_equals(true, dbm.empty?)
+    else
+      assert_equals(false, dbm.empty?)
+    end
+  end
+
+  def test_version
+    STDERR.print DBM::VERSION
+  end
+
+  def test_s_new_has_no_block
+    # DBM.new ignore the block
+    foo = true
+    assert_instance_of(DBM, dbm = DBM.new("tmptest_dbm") { foo = false })
+    assert_equals(foo, true)
+    assert_nil(dbm.close)
+  end
+  def test_s_open_no_create
+    assert_nil(dbm = DBM.open("tmptest_dbm", nil))
+  ensure
+    dbm.close if dbm
+  end
+  def test_s_open_with_block
+    assert_equals(DBM.open("tmptest_dbm") { :foo }, :foo)
+  end
+  def test_s_open_lock
+    fork() {
+      assert_instance_of(DBM, dbm = DBM.open("tmptest_dbm", 0644))
+      sleep 2
+    }
+    begin
+      sleep 1
+      assert_exception(Errno::EWOULDBLOCK, "NEVER MIND IF YOU USE Berkeley DB3") {
+	begin
+	  assert_instance_of(DBM, dbm2 = DBM.open("tmptest_dbm", 0644))
+	rescue Errno::EAGAIN, Errno::EACCES, Errno::EINVAL
+	  raise Errno::EWOULDBLOCK
+	end
+      }
+    ensure
+      Process.wait
+    end
+  end
+
+=begin
+  # Is it guaranteed on many OS?
+  def test_s_open_lock_one_process
+    # locking on one process
+    assert_instance_of(DBM, dbm  = DBM.open("tmptest_dbm", 0644))
+    assert_exception(Errno::EWOULDBLOCK) {
+      begin
+	DBM.open("tmptest_dbm", 0644)
+      rescue Errno::EAGAIN
+	raise Errno::EWOULDBLOCK
+      end
+    }
+  end
+=end
+
+  def test_s_open_nolock
+    # dbm 1.8.0 specific
+    if not defined? DBM::NOLOCK
+      return
+    end
+
+    fork() {
+      assert_instance_of(DBM, dbm  = DBM.open("tmptest_dbm", 0644,
+						DBM::NOLOCK))
+      sleep 2
+    }
+    sleep 1
+    begin
+      dbm2 = nil
+      assert_no_exception(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
+	assert_instance_of(DBM, dbm2 = DBM.open("tmptest_dbm", 0644))
+      }
+    ensure
+      Process.wait
+      dbm2.close if dbm2
+    end
+
+    p Dir.glob("tmptest_dbm*") if $DEBUG
+
+    fork() {
+      assert_instance_of(DBM, dbm  = DBM.open("tmptest_dbm", 0644))
+      sleep 2
+    }
+    begin
+      sleep 1
+      dbm2 = nil
+      assert_no_exception(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
+	# this test is failed on Cygwin98 (???)
+	assert_instance_of(DBM, dbm2 = DBM.open("tmptest_dbm", 0644,
+						   DBM::NOLOCK))
+      }
+    ensure
+      Process.wait
+      dbm2.close if dbm2
+    end
+  end
+
+  def test_s_open_error
+    assert_instance_of(DBM, dbm = DBM.open("tmptest_dbm", 0))
+    assert_exception(Errno::EACCES, "NEVER MIND IF YOU USE Berkeley DB3") {
+      DBM.open("tmptest_dbm", 0)
+    }
+    dbm.close
+  end
+
+  def test_close
+    assert_instance_of(DBM, dbm = DBM.open("tmptest_dbm"))
+    assert_nil(dbm.close)
+
+    # closed DBM file
+    assert_exception(DBMError) { dbm.close }
+  end
+
+  def test_aref
+    assert_equals('bar', @dbm['foo'] = 'bar')
+    assert_equals('bar', @dbm['foo'])
+
+    assert_nil(@dbm['bar'])
+  end
+
+  def test_fetch
+    assert_equals('bar', @dbm['foo']='bar')
+    assert_equals('bar', @dbm.fetch('foo'))
+
+    # key not found
+    assert_exception(IndexError) {
+      @dbm.fetch('bar')
+    }
+
+    # test for `ifnone' arg
+    assert_equals('baz', @dbm.fetch('bar', 'baz'))
+
+    # test for `ifnone' block
+    assert_equals('foobar', @dbm.fetch('bar') {|key| 'foo' + key })
+  end
+
+  def test_aset
+    num = 0
+    2.times {|i|
+      assert_equals('foo', @dbm['foo'] = 'foo')
+      assert_equals('foo', @dbm['foo'])
+      assert_equals('bar', @dbm['foo'] = 'bar')
+      assert_equals('bar', @dbm['foo'])
+
+      num += 1 if i == 0
+      assert_equals(num, @dbm.size)
+
+      # assign nil
+      assert_equals('', @dbm['bar'] = '')
+      assert_equals('', @dbm['bar'])
+
+      num += 1 if i == 0
+      assert_equals(num, @dbm.size)
+
+      # empty string
+      assert_equals('', @dbm[''] = '')
+      assert_equals('', @dbm[''])
+
+      num += 1 if i == 0
+      assert_equals(num, @dbm.size)
+
+      # Fixnum
+      assert_equals('200', @dbm['100'] = '200')
+      assert_equals('200', @dbm['100'])
+
+      num += 1 if i == 0
+      assert_equals(num, @dbm.size)
+
+      # Big key and value
+      assert_equals('y' * 100, @dbm['x' * 100] = 'y' * 100)
+      assert_equals('y' * 100, @dbm['x' * 100])
+
+      num += 1 if i == 0
+      assert_equals(num, @dbm.size)
+    }
+  end
+
+  def test_index
+    assert_equals('bar', @dbm['foo'] = 'bar')
+    assert_equals('foo', @dbm.index('bar'))
+    assert_nil(@dbm['bar'])
+  end
+
+  def test_indexes
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+    assert_equals(values.reverse, @dbm.indexes(*keys.reverse))
+  end
+
+  def test_values_at
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+    assert_equals(values.reverse, @dbm.values_at(*keys.reverse))
+  end
+
+  def test_select_with_block
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+    ret = @dbm.select {|k,v|
+      assert_equals(k.upcase, v)
+      k != "bar"
+    }
+    assert_equals([['baz', 'BAZ'], ['foo', 'FOO']],
+		  ret.sort)
+  end
+
+  def test_length
+    num = 10
+    assert_equals(0, @dbm.size)
+    num.times {|i|
+      i = i.to_s
+      @dbm[i] = i
+    }
+    assert_equals(num, @dbm.size)
+
+    @dbm.shift
+
+    assert_equals(num - 1, @dbm.size)
+  end
+
+  def test_empty?
+    assert_equals(true, @dbm.empty?)
+    @dbm['foo'] = 'FOO'
+    assert_equals(false, @dbm.empty?)
+  end
+
+  def test_each_pair
+    n = 0
+    @dbm.each_pair { n += 1 }
+    assert_equals(0, n)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+
+    n = 0
+    ret = @dbm.each_pair {|key, val|
+      assert_not_nil(i = keys.index(key))
+      assert_equals(val, values[i])
+
+      n += 1
+    }
+    assert_equals(keys.size, n)
+    assert_equals(@dbm, ret)
+  end
+
+  def test_each_value
+    n = 0
+    @dbm.each_value { n += 1 }
+    assert_equals(0, n)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+
+    n = 0
+    ret = @dbm.each_value {|val|
+      assert_not_nil(key = @dbm.index(val))
+      assert_not_nil(i = keys.index(key))
+      assert_equals(val, values[i])
+
+      n += 1
+    }
+    assert_equals(keys.size, n)
+    assert_equals(@dbm, ret)
+  end
+
+  def test_each_key
+    n = 0
+    @dbm.each_key { n += 1 }
+    assert_equals(0, n)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+
+    n = 0
+    ret = @dbm.each_key {|key|
+      assert_not_nil(i = keys.index(key))
+      assert_equals(@dbm[key], values[i])
+
+      n += 1
+    }
+    assert_equals(keys.size, n)
+    assert_equals(@dbm, ret)
+  end
+
+  def test_keys
+    assert_equals([], @dbm.keys)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+
+    assert_equals(keys.sort, @dbm.keys.sort)
+    assert_equals(values.sort, @dbm.values.sort)
+  end
+
+  def test_values
+    test_keys
+  end
+
+  def test_shift
+    assert_nil(@dbm.shift)
+    assert_equals(0, @dbm.size)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+
+    ret_keys = []
+    ret_values = []
+    while ret = @dbm.shift
+      ret_keys.push ret[0]
+      ret_values.push ret[1]
+
+      assert_equals(keys.size - ret_keys.size, @dbm.size)
+    end
+
+    assert_equals(keys.sort, ret_keys.sort)
+    assert_equals(values.sort, ret_values.sort)
+  end
+
+  def test_delete
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+    key = keys[1]
+
+    assert_nil(@dbm.delete(key))
+    assert_equals(0, @dbm.size)
+
+    @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values
+
+    assert_equals('BAR', @dbm.delete(key))
+    assert_nil(@dbm[key])
+    assert_equals(2, @dbm.size)
+
+    assert_nil(@dbm.delete(key))
+
+    if /^CYGWIN_9/ !~ SYSTEM
+      assert_exception(DBMError) {
+	@dbm_rdonly.delete("foo")
+      }
+
+      assert_nil(@dbm_rdonly.delete("bar"))
+    end
+  end
+  def test_delete_with_block
+    key = 'no called block'
+    @dbm[key] = 'foo'
+    assert_equals('foo', @dbm.delete(key) {|k| k.replace 'called block'})
+    assert_equals('no called block', key)
+    assert_equals(0, @dbm.size)
+
+    key = 'no called block'
+    assert_equals(:blockval,
+		  @dbm.delete(key) {|k| k.replace 'called block'; :blockval})
+    assert_equals('called block', key)
+    assert_equals(0, @dbm.size)
+  end
+
+  def test_delete_if
+    v = "0"
+    100.times {@dbm[v] = v; v = v.next}
+
+    ret = @dbm.delete_if {|key, val| key.to_i < 50}
+    assert_equals(@dbm, ret)
+    check_size(50, @dbm)
+
+    ret = @dbm.delete_if {|key, val| key.to_i >= 50}
+    assert_equals(@dbm, ret)
+    check_size(0, @dbm)
+
+    # break
+    v = "0"
+    100.times {@dbm[v] = v; v = v.next}
+    check_size(100, @dbm)
+    n = 0;
+    @dbm.delete_if {|key, val|
+      break if n > 50
+      n+=1
+      true
+    }
+    assert_equals(51, n)
+    check_size(49, @dbm)
+
+    @dbm.clear
+
+    # raise
+    v = "0"
+    100.times {@dbm[v] = v; v = v.next}
+    check_size(100, @dbm)
+    n = 0;
+    begin
+      @dbm.delete_if {|key, val|
+	raise "runtime error" if n > 50
+	n+=1
+	true
+      }
+    rescue
+    end
+    assert_equals(51, n)
+    check_size(49, @dbm)
+  end
+
+  def test_reject
+    v = "0"
+    100.times {@dbm[v] = v; v = v.next}
+
+    hash = @dbm.reject {|key, val| key.to_i < 50}
+    assert_instance_of(Hash, hash)
+    assert_equals(100, @dbm.size)
+
+    assert_equals(50, hash.size)
+    hash.each_pair {|key,val|
+      assert_equals(false, key.to_i < 50)
+      assert_equals(key, val)
+    }
+
+    hash = @dbm.reject {|key, val| key.to_i < 100}
+    assert_instance_of(Hash, hash)
+    assert_equals(true, hash.empty?)
+  end
+
+  def test_clear
+    v = "1"
+    100.times {v = v.next; @dbm[v] = v}
+
+    assert_equals(@dbm, @dbm.clear)
+
+    # validate DBM#size
+    i = 0
+    @dbm.each { i += 1 }
+    assert_equals(@dbm.size, i)
+    assert_equals(0, i)
+  end
+
+  def test_invert
+    v = "0"
+    100.times {@dbm[v] = v; v = v.next}
+
+    hash = @dbm.invert
+    assert_instance_of(Hash, hash)
+    assert_equals(100, hash.size)
+    hash.each_pair {|key, val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+
+  def test_update
+    hash = {}
+    v = "0"
+    100.times {v = v.next; hash[v] = v}
+
+    @dbm["101"] = "101"
+    @dbm.update hash
+    assert_equals(101, @dbm.size)
+    @dbm.each_pair {|key, val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+
+  def test_replace
+    hash = {}
+    v = "0"
+    100.times {v = v.next; hash[v] = v}
+
+    @dbm["101"] = "101"
+    @dbm.replace hash
+    assert_equals(100, @dbm.size)
+    @dbm.each_pair {|key, val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+
+  def test_haskey?
+    assert_equals('bar', @dbm['foo']='bar')
+    assert_equals(true,  @dbm.has_key?('foo'))
+    assert_equals(false, @dbm.has_key?('bar'))
+  end
+
+  def test_has_value?
+    assert_equals('bar', @dbm['foo']='bar')
+    assert_equals(true,  @dbm.has_value?('bar'))
+    assert_equals(false, @dbm.has_value?('foo'))
+  end
+
+  def test_to_a
+    v = "0"
+    100.times {v = v.next; @dbm[v] = v}
+
+    ary = @dbm.to_a
+    assert_instance_of(Array, ary)
+    assert_equals(100, ary.size)
+    ary.each {|key,val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+
+  def test_to_hash
+    v = "0"
+    100.times {v = v.next; @dbm[v] = v}
+
+    hash = @dbm.to_hash
+    assert_instance_of(Hash, hash)
+    assert_equals(100, hash.size)
+    hash.each {|key,val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+end
+
+if $0 == __FILE__
+  if ARGV.size == 0
+    suite = RUNIT::TestSuite.new
+    suite.add_test(TestDBM.suite)
+  else
+    suite = RUNIT::TestSuite.new
+    ARGV.each do |testmethod|
+      suite.add_test(TestDBM.new(testmethod))
+    end
+  end
+
+  RUNIT::CUI::TestRunner.run(suite)
+end
diff --git a/ext/digest/defs.h b/ext/digest/defs.h
index d51c627cf9..5cfc77dd24 100644
--- a/ext/digest/defs.h
+++ b/ext/digest/defs.h
@@ -1,5 +1,5 @@
 /* -*- C -*-
- * $Id: defs.h,v 1.7 2003/06/01 15:39:52 eban Exp $
+ * $Id$
  */
 
 #ifndef DEFS_H
diff --git a/ext/digest/digest.c b/ext/digest/digest.c
index 957fe4f6ea..70f986327a 100644
--- a/ext/digest/digest.c
+++ b/ext/digest/digest.c
@@ -2,14 +2,14 @@
 
   digest.c -
 
-  $Author: matz $
+  $Author$
   created at: Fri May 25 08:57:27 JST 2001
 
   Copyright (C) 1995-2001 Yukihiro Matsumoto
   Copyright (C) 2001 Akinori MUSHA
 
   $RoughId: digest.c,v 1.16 2001/07/13 15:38:27 knu Exp $
-  $Id: digest.c,v 1.14.2.2 2005/12/12 00:36:51 matz Exp $
+  $Id$
 
 ************************************************/
 
@@ -91,7 +91,7 @@ rb_digest_base_s_digest(klass, str)
     void *pctx;
     size_t len;
     unsigned char *digest;
-    volatile VALUE obj = rb_digest_base_alloc(klass);
+    VALUE obj = rb_digest_base_alloc(klass);
 
     algo = get_digest_base_metadata(klass);
     Data_Get_Struct(obj, void, pctx);
@@ -120,7 +120,7 @@ rb_digest_base_s_hexdigest(klass, str)
     void *pctx;
     size_t len;
     unsigned char *hexdigest;
-    volatile VALUE obj = rb_digest_base_alloc(klass);
+    VALUE obj = rb_digest_base_alloc(klass);
 
     algo = get_digest_base_metadata(klass);
     Data_Get_Struct(obj, void, pctx);
diff --git a/ext/digest/digest.h b/ext/digest/digest.h
index 578be0a3c4..5e846df040 100644
--- a/ext/digest/digest.h
+++ b/ext/digest/digest.h
@@ -2,14 +2,14 @@
 
   digest.c -
 
-  $Author: knu $
+  $Author$
   created at: Fri May 25 08:54:56 JST 2001
 
 
   Copyright (C) 2001 Akinori MUSHA
 
   $RoughId: digest.h,v 1.3 2001/07/13 15:38:27 knu Exp $
-  $Id: digest.h,v 1.1 2001/07/13 20:06:13 knu Exp $
+  $Id$
 
 ************************************************/
 
diff --git a/ext/digest/digest.txt b/ext/digest/digest.txt
index 4969a9da90..5797dd18f9 100644
--- a/ext/digest/digest.txt
+++ b/ext/digest/digest.txt
@@ -1,6 +1,6 @@
 .\" digest.txt -  -*- Indented-Text -*- created at: Fri May 25 08:13:50 JST 2001
 $RoughId: digest.txt,v 1.9 2001/07/13 19:46:51 knu Exp $
-$Id: digest.txt,v 1.1 2001/07/13 20:06:13 knu Exp $
+$Id$
 
 ** MD5(Class)
 
diff --git a/ext/digest/digest.txt.ja b/ext/digest/digest.txt.ja
index 7078c83573..8997d25b9d 100644
--- a/ext/digest/digest.txt.ja
+++ b/ext/digest/digest.txt.ja
@@ -1,6 +1,6 @@
 .\" digest.txt.ja -  -*- Indented-Text -*- created at: Fri May 25 08:22:19 JST 2001
 $RoughId: digest.txt.jp,v 1.8 2001/07/13 15:38:27 knu Exp $
-$Id: digest.txt.ja,v 1.1 2001/07/19 05:42:07 knu Exp $
+$Id$
 
 ** MD5(���饹)
 
diff --git a/ext/digest/extconf.rb b/ext/digest/extconf.rb
index 3e35bf5064..cd512622a4 100644
--- a/ext/digest/extconf.rb
+++ b/ext/digest/extconf.rb
@@ -1,5 +1,5 @@
 # $RoughId: extconf.rb,v 1.6 2001/07/13 15:38:27 knu Exp $
-# $Id: extconf.rb,v 1.1 2001/07/13 20:06:13 knu Exp $
+# $Id$
 
 require "mkmf"
 
diff --git a/ext/digest/lib/md5.rb b/ext/digest/lib/md5.rb
index 6867fdc71b..1d05d7d04e 100644
--- a/ext/digest/lib/md5.rb
+++ b/ext/digest/lib/md5.rb
@@ -1,7 +1,7 @@
 # just for compatibility; requiring "md5" is obsoleted
 #
 # $RoughId: md5.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
-# $Id: md5.rb,v 1.1 2001/07/13 20:06:14 knu Exp $
+# $Id$
 
 require 'digest/md5'
 
diff --git a/ext/digest/lib/sha1.rb b/ext/digest/lib/sha1.rb
index 12fb5cdfa4..c4ac6f66ea 100644
--- a/ext/digest/lib/sha1.rb
+++ b/ext/digest/lib/sha1.rb
@@ -1,7 +1,7 @@
 # just for compatibility; requiring "sha1" is obsoleted
 #
 # $RoughId: sha1.rb,v 1.4 2001/07/13 15:38:27 knu Exp $
-# $Id: sha1.rb,v 1.1 2001/07/13 20:06:14 knu Exp $
+# $Id$
 
 require 'digest/sha1'
 
diff --git a/ext/digest/md5/extconf.rb b/ext/digest/md5/extconf.rb
index ea29c9c5f8..9acf7ba9c0 100644
--- a/ext/digest/md5/extconf.rb
+++ b/ext/digest/md5/extconf.rb
@@ -1,10 +1,9 @@
 # $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
-# $Id: extconf.rb,v 1.4.2.2 2006/05/25 23:44:05 nobu Exp $
+# $Id$
 
 require "mkmf"
 
-$defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
+$CFLAGS << " -DHAVE_CONFIG_H -I#{File.dirname(__FILE__)}/.."
 
 $objs = [ "md5init.#{$OBJEXT}" ]
 
diff --git a/ext/digest/md5/md5.c b/ext/digest/md5/md5.c
index ed32cf95c1..6b61f031c4 100644
--- a/ext/digest/md5/md5.c
+++ b/ext/digest/md5/md5.c
@@ -43,7 +43,7 @@
 
 /*$OrigId: md5c.c,v 1.2 2001/03/26 08:57:14 matz Exp $ */
 /*$RoughId: md5.c,v 1.2 2001/07/13 19:48:41 knu Exp $ */
-/*$Id: md5.c,v 1.1 2001/07/13 20:06:14 knu Exp $ */
+/*$Id$ */
 
 #include "md5.h"
 
diff --git a/ext/digest/md5/md5.h b/ext/digest/md5/md5.h
index 736e034512..fc41380d38 100644
--- a/ext/digest/md5/md5.h
+++ b/ext/digest/md5/md5.h
@@ -41,7 +41,7 @@
 
 /* $OrigId: md5.h,v 1.2 2001/03/26 08:57:14 matz Exp $ */
 /* $RoughId: md5.h,v 1.3 2002/02/24 08:14:31 knu Exp $ */
-/* $Id: md5.h,v 1.2 2002/02/24 08:20:22 knu Exp $ */
+/* $Id$ */
 
 #ifndef MD5_INCLUDED
 #  define MD5_INCLUDED
diff --git a/ext/digest/md5/md5init.c b/ext/digest/md5/md5init.c
index 52f5de540f..2acca16a46 100644
--- a/ext/digest/md5/md5init.c
+++ b/ext/digest/md5/md5init.c
@@ -1,5 +1,5 @@
 /* $RoughId: md5init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
-/* $Id: md5init.c,v 1.5 2002/09/26 16:27:23 knu Exp $ */
+/* $Id$ */
 
 #include "digest.h"
 #if defined(HAVE_OPENSSL_MD5_H)
diff --git a/ext/digest/md5/md5ossl.c b/ext/digest/md5/md5ossl.c
index 4af7d19ba5..d930c7ab51 100644
--- a/ext/digest/md5/md5ossl.c
+++ b/ext/digest/md5/md5ossl.c
@@ -1,4 +1,4 @@
-/* $Id: md5ossl.c,v 1.2 2003/01/06 11:47:53 knu Exp $ */
+/* $Id$ */
 
 #include "md5ossl.h"
 #include <sys/types.h>
diff --git a/ext/digest/md5/md5ossl.h b/ext/digest/md5/md5ossl.h
index 401ef3418d..dda7c743ed 100644
--- a/ext/digest/md5/md5ossl.h
+++ b/ext/digest/md5/md5ossl.h
@@ -1,9 +1,8 @@
-/* $Id: md5ossl.h,v 1.1.2.1 2005/08/30 10:43:34 gotoyuzo Exp $ */
+/* $Id$ */
 
 #ifndef MD5OSSL_H_INCLUDED
 #define MD5OSSL_H_INCLUDED
 
-#include <stddef.h>
 #include <openssl/md5.h>
 
 void MD5_End(MD5_CTX *pctx, unsigned char *hexdigest);
diff --git a/ext/digest/rmd160/extconf.rb b/ext/digest/rmd160/extconf.rb
index 232a3a5e06..5bc968385c 100644
--- a/ext/digest/rmd160/extconf.rb
+++ b/ext/digest/rmd160/extconf.rb
@@ -1,10 +1,9 @@
 # $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
-# $Id: extconf.rb,v 1.4.2.2 2006/05/25 23:44:05 nobu Exp $
+# $Id$
 
 require "mkmf"
 
-$defs << "-DNDEBUG" << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
+$CFLAGS << " -DHAVE_CONFIG_H -I#{File.dirname(__FILE__)}/.."
 
 $objs = [ "rmd160init.#{$OBJEXT}" ]
 
diff --git a/ext/digest/rmd160/rmd160.c b/ext/digest/rmd160/rmd160.c
index 9562a6fe67..2de3c99b29 100644
--- a/ext/digest/rmd160/rmd160.c
+++ b/ext/digest/rmd160/rmd160.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: rmd160.c,v 1.1.1.1 2001/03/06 11:21:05 agc Exp $	*/
 /*	$RoughId: rmd160.c,v 1.2 2001/07/13 19:49:10 knu Exp $	*/
-/*	$Id: rmd160.c,v 1.1 2001/07/13 20:06:14 knu Exp $	*/
+/*	$Id$	*/
 
 /********************************************************************\
  *
diff --git a/ext/digest/rmd160/rmd160.h b/ext/digest/rmd160/rmd160.h
index 7df190413e..24f9a025f0 100644
--- a/ext/digest/rmd160/rmd160.h
+++ b/ext/digest/rmd160/rmd160.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: rmd160.h,v 1.2 2000/07/07 10:47:06 ad Exp $	*/
 /*	$RoughId: rmd160.h,v 1.3 2002/02/24 08:14:31 knu Exp $	*/
-/*	$Id: rmd160.h,v 1.2 2002/02/24 08:20:22 knu Exp $	*/
+/*	$Id$	*/
 
 /********************************************************************\
  *
diff --git a/ext/digest/rmd160/rmd160hl.c b/ext/digest/rmd160/rmd160hl.c
index 14299d7c7a..4c5e0217d9 100644
--- a/ext/digest/rmd160/rmd160hl.c
+++ b/ext/digest/rmd160/rmd160hl.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: rmd160hl.c,v 1.1.1.1 2001/03/06 11:21:05 agc Exp $	*/
 /*	$RoughId: rmd160hl.c,v 1.2 2001/07/13 19:49:10 knu Exp $	*/
-/*	$Id: rmd160hl.c,v 1.1 2001/07/13 20:06:14 knu Exp $	*/
+/*	$Id$	*/
 
 /* rmd160hl.c
  * ----------------------------------------------------------------------------
diff --git a/ext/digest/rmd160/rmd160init.c b/ext/digest/rmd160/rmd160init.c
index 3aa7847019..b16cdbbed8 100644
--- a/ext/digest/rmd160/rmd160init.c
+++ b/ext/digest/rmd160/rmd160init.c
@@ -1,5 +1,5 @@
 /* $RoughId: rmd160init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
-/* $Id: rmd160init.c,v 1.3 2002/09/26 17:26:46 knu Exp $ */
+/* $Id$ */
 
 #include "digest.h"
 #if defined(HAVE_OPENSSL_RIPEMD_H)
diff --git a/ext/digest/rmd160/rmd160ossl.c b/ext/digest/rmd160/rmd160ossl.c
index 1a8436dfb8..be66d81ff9 100644
--- a/ext/digest/rmd160/rmd160ossl.c
+++ b/ext/digest/rmd160/rmd160ossl.c
@@ -1,7 +1,7 @@
-/* $Id: rmd160ossl.c,v 1.1.2.1 2006/08/07 09:01:27 matz Exp $ */
+/* $Id$ */
 
-#include "defs.h"
 #include "rmd160ossl.h"
+#include "defs.h"
 #include <assert.h>
 #include <stdlib.h>
 
diff --git a/ext/digest/rmd160/rmd160ossl.h b/ext/digest/rmd160/rmd160ossl.h
index 30840ca598..824a1bf32f 100644
--- a/ext/digest/rmd160/rmd160ossl.h
+++ b/ext/digest/rmd160/rmd160ossl.h
@@ -1,9 +1,8 @@
-/* $Id: rmd160ossl.h,v 1.1.2.1 2005/08/30 10:43:35 gotoyuzo Exp $ */
+/* $Id$ */
 
 #ifndef RMD160OSSL_H_INCLUDED
 #define RMD160OSSL_H_INCLUDED
 
-#include <stddef.h>
 #include <openssl/ripemd.h>
 
 #define RMD160_CTX	RIPEMD160_CTX
diff --git a/ext/digest/sha1/extconf.rb b/ext/digest/sha1/extconf.rb
index 861c5563f9..c249a415ed 100644
--- a/ext/digest/sha1/extconf.rb
+++ b/ext/digest/sha1/extconf.rb
@@ -1,10 +1,9 @@
 # $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
-# $Id: extconf.rb,v 1.5.2.1 2006/05/25 23:44:05 nobu Exp $
+# $Id$
 
 require "mkmf"
 
-$defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
+$CFLAGS << " -DHAVE_CONFIG_H -I#{File.dirname(__FILE__)}/.."
 
 $objs = [ "sha1init.#{$OBJEXT}" ]
 
diff --git a/ext/digest/sha1/sha1.c b/ext/digest/sha1/sha1.c
index ba926e1fad..1012ef8751 100644
--- a/ext/digest/sha1/sha1.c
+++ b/ext/digest/sha1/sha1.c
@@ -1,7 +1,7 @@
 /*	$NetBSD: sha1.c,v 1.2 2001/03/22 09:51:48 agc Exp $	*/
 /*	$OpenBSD: sha1.c,v 1.9 1997/07/23 21:12:32 kstailey Exp $	*/
 /*	$RoughId: sha1.c,v 1.2 2001/07/13 19:49:10 knu Exp $	*/
-/*	$Id: sha1.c,v 1.1 2001/07/13 20:06:14 knu Exp $	*/
+/*	$Id$	*/
 
 /*
  * SHA-1 in C
diff --git a/ext/digest/sha1/sha1.h b/ext/digest/sha1/sha1.h
index 5a1143ea0d..2303cecc2b 100644
--- a/ext/digest/sha1/sha1.h
+++ b/ext/digest/sha1/sha1.h
@@ -1,6 +1,6 @@
 /*	$NetBSD: sha1.h,v 1.2 1998/05/29 22:55:44 thorpej Exp $	*/
 /*	$RoughId: sha1.h,v 1.3 2002/02/24 08:14:32 knu Exp $	*/
-/*	$Id: sha1.h,v 1.2 2002/02/24 08:20:22 knu Exp $	*/
+/*	$Id$	*/
 
 /*
  * SHA-1 in C
diff --git a/ext/digest/sha1/sha1hl.c b/ext/digest/sha1/sha1hl.c
index 47b802085d..d1a236b22c 100644
--- a/ext/digest/sha1/sha1hl.c
+++ b/ext/digest/sha1/sha1hl.c
@@ -1,6 +1,6 @@
 /*	$NetBSD: sha1hl.c,v 1.2 2001/03/10 15:55:14 tron Exp $	*/
 /*	$RoughId: sha1hl.c,v 1.2 2001/07/13 19:49:10 knu Exp $	*/
-/*	$Id: sha1hl.c,v 1.1 2001/07/13 20:06:14 knu Exp $	*/
+/*	$Id$	*/
 
 /* sha1hl.c
  * ----------------------------------------------------------------------------
diff --git a/ext/digest/sha1/sha1init.c b/ext/digest/sha1/sha1init.c
index 829a363921..426afb7cd0 100644
--- a/ext/digest/sha1/sha1init.c
+++ b/ext/digest/sha1/sha1init.c
@@ -1,5 +1,5 @@
 /* $RoughId: sha1init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
-/* $Id: sha1init.c,v 1.3 2002/09/26 17:44:33 knu Exp $ */
+/* $Id$ */
 
 #include "digest.h"
 #if defined(HAVE_OPENSSL_SHA_H)
diff --git a/ext/digest/sha1/sha1ossl.c b/ext/digest/sha1/sha1ossl.c
index 72c6eb4092..b125128f82 100644
--- a/ext/digest/sha1/sha1ossl.c
+++ b/ext/digest/sha1/sha1ossl.c
@@ -1,7 +1,7 @@
-/* $Id: sha1ossl.c,v 1.1.2.1 2006/08/07 09:01:27 matz Exp $ */
+/* $Id$ */
 
-#include "defs.h"
 #include "sha1ossl.h"
+#include "defs.h"
 #include <assert.h>
 #include <stdlib.h>
 
diff --git a/ext/digest/sha1/sha1ossl.h b/ext/digest/sha1/sha1ossl.h
index 24b84b4274..e8d7e74baf 100644
--- a/ext/digest/sha1/sha1ossl.h
+++ b/ext/digest/sha1/sha1ossl.h
@@ -1,9 +1,8 @@
-/* $Id: sha1ossl.h,v 1.1.2.1 2005/08/30 10:43:36 gotoyuzo Exp $ */
+/* $Id$ */
 
 #ifndef SHA1OSSL_H_INCLUDED
 #define SHA1OSSL_H_INCLUDED
 
-#include <stddef.h>
 #include <openssl/sha.h>
 
 #define SHA1_CTX	SHA_CTX
diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb
index 5d078f4bd6..c982aa64de 100644
--- a/ext/digest/sha2/extconf.rb
+++ b/ext/digest/sha2/extconf.rb
@@ -1,10 +1,9 @@
 # $RoughId: extconf.rb,v 1.4 2001/08/14 19:54:51 knu Exp $
-# $Id: extconf.rb,v 1.7.2.2 2006/05/25 23:44:06 nobu Exp $
+# $Id$
 
 require "mkmf"
 
-$defs << "-DHAVE_CONFIG_H"
-$INCFLAGS << " -I$(srcdir)/.."
+$CFLAGS << " -DHAVE_CONFIG_H -I#{File.dirname(__FILE__)}/.."
 
 $objs = [
   "sha2.#{$OBJEXT}",
@@ -18,6 +17,12 @@ have_header("inttypes.h")
 
 have_header("unistd.h")
 
-if have_type("uint64_t", "defs.h", $defs.join(' '))
+if try_cpp(<<SRC, $defs.join(' '))
+#include "defs.h"
+#ifdef NO_UINT64_T
+  #error ** Cannot find a 64bit integer type - skipping the SHA2 module.
+#endif
+SRC
+then
   create_makefile("digest/sha2")
 end
diff --git a/ext/digest/sha2/sha2.c b/ext/digest/sha2/sha2.c
index 22e7d59cd3..24a57ded0d 100644
--- a/ext/digest/sha2/sha2.c
+++ b/ext/digest/sha2/sha2.c
@@ -34,7 +34,7 @@
  */
 
 /* $RoughId: sha2.c,v 1.3 2002/02/26 22:03:36 knu Exp $ */
-/* $Id: sha2.c,v 1.4.2.1 2005/12/24 09:58:56 matz Exp $ */
+/* $Id$ */
 
 #include "sha2.h"
 #include <stdio.h>
@@ -67,7 +67,7 @@ typedef uint8_t  sha2_byte;	/* Exactly 1 byte */
 typedef uint32_t sha2_word32;	/* Exactly 4 bytes */
 typedef uint64_t sha2_word64;	/* Exactly 8 bytes */
 
-#if defined(__GNUC__) || defined(_HPUX_SOURCE) || defined(__IBMC__)
+#if defined(__GNUC__) || defined(_HPUX_SOURCE)
 #define ULL(number)	number##ULL
 #else
 #define ULL(number)	(uint64_t)(number)
diff --git a/ext/digest/sha2/sha2.h b/ext/digest/sha2/sha2.h
index 7ccf012b77..4689ad93ce 100644
--- a/ext/digest/sha2/sha2.h
+++ b/ext/digest/sha2/sha2.h
@@ -34,7 +34,7 @@
  */
 
 /* $RoughId: sha2.h,v 1.3 2002/02/24 08:14:32 knu Exp $ */
-/* $Id: sha2.h,v 1.2 2002/02/24 08:20:22 knu Exp $ */
+/* $Id$ */
 
 #ifndef __SHA2_H__
 #define __SHA2_H__
diff --git a/ext/digest/sha2/sha2hl.c b/ext/digest/sha2/sha2hl.c
index 8f09bd6e5a..03fde538c3 100644
--- a/ext/digest/sha2/sha2hl.c
+++ b/ext/digest/sha2/sha2hl.c
@@ -1,6 +1,6 @@
 /* $NetBSD: sha2hl.c,v 1.1 2001/03/12 09:08:40 agc Exp $	 */
 /* $RoughId: sha2hl.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
-/* $Id: sha2hl.c,v 1.1 2001/07/13 20:06:14 knu Exp $ */
+/* $Id$ */
 
 /*
  * sha2hl.c
diff --git a/ext/digest/sha2/sha2init.c b/ext/digest/sha2/sha2init.c
index 9c0f9854fb..4b14031811 100644
--- a/ext/digest/sha2/sha2init.c
+++ b/ext/digest/sha2/sha2init.c
@@ -1,5 +1,5 @@
 /* $RoughId: sha2init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
-/* $Id: sha2init.c,v 1.2 2002/02/17 12:43:44 nobu Exp $ */
+/* $Id$ */
 
 #include "digest.h"
 #include "sha2.h"
diff --git a/ext/digest/test.sh b/ext/digest/test.sh
index 2ae2688e4d..6fb07d2177 100644
--- a/ext/digest/test.sh
+++ b/ext/digest/test.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $RoughId: test.sh,v 1.5 2001/07/13 15:38:27 knu Exp $
-# $Id: test.sh,v 1.2 2002/09/26 17:55:16 knu Exp $
+# $Id$
 
 RUBY=${RUBY:=ruby}
 MAKE=${MAKE:=make}
diff --git a/ext/dl/dl.c b/ext/dl/dl.c
index 71c353bda3..22abb754d2 100644
--- a/ext/dl/dl.c
+++ b/ext/dl/dl.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dl.c,v 1.20.2.5 2005/12/16 13:32:06 ttate Exp $
+ * $Id$
  */
 
 #include <ruby.h>
@@ -147,7 +147,7 @@ dlstrdup(const char *str)
 {
   char *newstr;
 
-  newstr = (char*)dlmalloc(strlen(str)+1);
+  newstr = (char*)dlmalloc(strlen(str));
   strcpy(newstr,str);
 
   return newstr;
@@ -435,15 +435,7 @@ c_parray(VALUE v, long *size)
 	ary[i] = (void*)(pdata->ptr);
       }
       else{
-        e = rb_funcall(e, rb_intern("to_ptr"), 0);
-        if (rb_obj_is_kind_of(e, rb_cDLPtrData)) {
-	  struct ptr_data *pdata;
-	  Data_Get_Struct(e, struct ptr_data, pdata);
-	  ary[i] = (void*)(pdata->ptr);
-	}
-	else{
-	  rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
-	}
+	rb_raise(rb_eDLTypeError, "unexpected type of the element #%d", i);
       }
       break;
     }
@@ -459,7 +451,7 @@ rb_ary2cary(char t, VALUE v, long *size)
   VALUE val0;
 
   val0 = rb_check_array_type(v);
-  if(NIL_P(val0)) {
+  if(NIL_P(TYPE(val0))) {
     rb_raise(rb_eDLTypeError, "an array is expected.");
   }
   v = val0;
@@ -503,12 +495,6 @@ rb_ary2cary(char t, VALUE v, long *size)
     if (rb_obj_is_kind_of(val0, rb_cDLPtrData)) {
       return (void*)c_parray(v,size);
     }
-    else{
-      val0 = rb_funcall(val0, rb_intern("to_ptr"), 0);
-      if (rb_obj_is_kind_of(val0, rb_cDLPtrData)) {
-        return (void*)c_parray(v,size);
-      }
-    }
     rb_raise(rb_eDLTypeError, "type mismatch");
   case T_NIL:
     return (void*)c_parray(v, size);
@@ -557,7 +543,7 @@ rb_io_to_ptr(VALUE self)
   GetOpenFile(self, fptr);
   fp = fptr->f;
 
-  return fp ? rb_dlptr_new(fp, 0, 0) : Qnil;
+  return fp ? rb_dlptr_new(fp, sizeof(FILE), 0) : Qnil;
 }
 
 VALUE
diff --git a/ext/dl/dl.h b/ext/dl/dl.h
index 9e4e01eea5..1faa316cf1 100644
--- a/ext/dl/dl.h
+++ b/ext/dl/dl.h
@@ -1,5 +1,5 @@
 /* -*- C -*-
- * $Id: dl.h,v 1.9 2003/12/01 23:02:44 ttate Exp $
+ * $Id$
  */
 
 #ifndef RUBY_DL_H
diff --git a/ext/dl/h2rb b/ext/dl/h2rb
index d5ebd6ee2c..00fbd60c82 100644
--- a/ext/dl/h2rb
+++ b/ext/dl/h2rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # -*- ruby -*-
-# $Id: h2rb,v 1.1 2002/04/02 10:56:13 ttate Exp $
+# $Id$
 
 require 'mkmf'
 require 'ftools'
diff --git a/ext/dl/handle.c b/ext/dl/handle.c
index 1e8c17e501..95b6dc74dc 100644
--- a/ext/dl/handle.c
+++ b/ext/dl/handle.c
@@ -1,5 +1,5 @@
 /* -*- C -*-
- * $Id: handle.c,v 1.11.2.1 2005/02/28 02:45:17 matz Exp $
+ * $Id$
  */
 
 #include <ruby.h>
@@ -161,7 +161,7 @@ rb_dlhandle_sym(int argc, VALUE argv[], VALUE self)
 
   Data_Get_Struct(self, struct dl_handle, dlhandle);
   if (!dlhandle->open) {
-    rb_raise(rb_eRuntimeError, "closed handle");
+    rb_raise(rb_eRuntimeError, "Closed handle.");
   }
   handle = dlhandle->ptr;
 
@@ -187,11 +187,11 @@ rb_dlhandle_sym(int argc, VALUE argv[], VALUE self)
       if (!func)
 #endif
       {
-	rb_raise(rb_eRuntimeError, "unknown symbol \"%sA\"", name);
+	rb_raise(rb_eRuntimeError, "Unknown symbol \"%sA\".", name);
       }
     }
 #else
-    rb_raise(rb_eRuntimeError, "unknown symbol \"%s\"", name);
+    rb_raise(rb_eRuntimeError, "Unknown symbol \"%s\".", name);
 #endif
   }
   val = rb_dlsym_new(func, name, stype);
diff --git a/ext/dl/lib/dl/import.rb b/ext/dl/lib/dl/import.rb
index 63c9b2c050..1ab5145def 100644
--- a/ext/dl/lib/dl/import.rb
+++ b/ext/dl/lib/dl/import.rb
@@ -38,10 +38,10 @@ module DL
 	case proto
 	when /^([\d\w\*_\s]+)\(([\d\w\*_\s\,\[\]]*)\)$/
 	  ret = $1
-	  args = $2.strip()
+	  args = $2
 	  ret = ret.split(/\s+/)
 	  args = args.split(/\s*,\s*/)
-	  func = ret.pop()
+	  func = ret.pop
 	  if( func =~ /^\*/ )
 	    func.gsub!(/^\*+/,"")
 	    ret.push("*")
@@ -70,11 +70,8 @@ module DL
 	init_types()
 	init_sym()
 
-	rty,renc,rdec = @types.encode_return_type(ret)
-        if( !rty )
-          raise(TypeError, "unsupported type: #{ret}")
-        end
-	ty,enc,dec = encode_argument_types(args)
+	rty,renc,rdec = @types.encode_type(ret)
+	ty,enc,dec = encode_types(args)
 	symty = rty + ty
 
 	module_eval("module_function :#{func}")
@@ -99,10 +96,9 @@ module DL
       # example:
       #  typealias("uint", "unsigned int")
       #
-      def typealias(alias_type, ty1, enc1=nil, dec1=nil, ty2=nil, enc2=nil, dec2=nil)
+      def typealias(*args)
 	init_types()
-	@types.typealias(alias_type, ty1, enc1, dec1,
-                                     ty2||ty1, enc2, dec2)
+	@types.typealias(*args)
       end
 
       # example:
@@ -135,11 +131,8 @@ module DL
 	init_types()
 	init_sym()
 
-	rty,_,rdec = @types.encode_return_type(rettype)
-        if( !rty )
-          raise(TypeError, "unsupported type: #{rettype}")
-        end
-	ty,enc,dec = encode_argument_types(argtypes)
+	rty,_,rdec = @types.encode_type(rettype)
+	ty,enc,dec = encode_types(argtypes)
 	symty = rty + ty
 
 	sym = symbol(name, symty)
@@ -185,16 +178,13 @@ module DL
 	return @retval
       end
 
-      def encode_argument_types(tys)
+      def encode_types(tys)
 	init_types()
 	encty = []
 	enc = nil
 	dec = nil
 	tys.each_with_index{|ty,idx|
-	  ty,c1,c2 = @types.encode_argument_type(ty)
-          if( !ty )
-            raise(TypeError, "unsupported type: #{ty}")
-          end
+	  ty,c1,c2,_,_ = @types.encode_type(ty)
 	  encty.push(ty)
 	  if( enc )
 	    if( c1 )
diff --git a/ext/dl/lib/dl/struct.rb b/ext/dl/lib/dl/struct.rb
index 33f303fe22..2c52d5040d 100644
--- a/ext/dl/lib/dl/struct.rb
+++ b/ext/dl/lib/dl/struct.rb
@@ -33,7 +33,7 @@ module DL
 	      "def #{name}",
 	      "  v = @ptr[\"#{name}\"]",
 	      "  if( @len[\"#{name}\"] )",
-	      "    v = v.collect{|x| @dec[\"#{name}\"] ? @dec[\"#{name}\"].call(x) : x }",
+	      "    v = v.collect{|x| @dec[\"#{name}\"].call(x) if @dec[\"#{name}\"] }",
               "  else",
 	      "    v = @dec[\"#{name}\"].call(v) if @dec[\"#{name}\"]",
 	      "  end",
@@ -41,7 +41,7 @@ module DL
 	      "end",
 	      "def #{name}=(v)",
 	      "  if( @len[\"#{name}\"] )",
-	      "    v = v.collect{|x| @enc[\"#{name}\"] ? @enc[\"#{name}\"].call(x) : x }",
+	      "    v = v.collect{|x| @enc[\"#{name}\"].call(x) if @enc[\"#{name}\"] }",
 	      "  else",
 	      "    v = @enc[\"#{name}\"].call(v) if @enc[\"#{name}\"]",
               "  end",
@@ -128,10 +128,7 @@ module DL
 	  else
 	    raise(RuntimeError, "invalid element: #{elem}")
 	  end
-	  ty,enc,dec = @types.encode_struct_type(ty)
-          if( !ty )
-            raise(TypeError, "unsupported type: #{ty}")
-          end
+	  ty,_,_,enc,dec = @types.encode_type(ty)
 	  return [name,ty,num,enc,dec]
 	end
       end  # class Struct
diff --git a/ext/dl/lib/dl/types.rb b/ext/dl/lib/dl/types.rb
index 1144917dae..139426473a 100644
--- a/ext/dl/lib/dl/types.rb
+++ b/ext/dl/lib/dl/types.rb
@@ -6,240 +6,175 @@ module DL
   class Types
     TYPES = [
       # FORMAT:
-      # ["alias name",
-      #  "type name", encoding_method, decoding_method,   for function prototypes
-      #  "type name", encoding_method, decoding_method]   for structures (not implemented)
+      # ["alias name", "type name",
+      #    encoding_method, decoding_method,   for function prototypes
+      #    encoding_method, decoding_method]   for structures (not implemented)
       
       # for Windows
-      ["DWORD",  "unsigned long", nil, nil,
-                 "unsigned long", nil, nil],
-      ["PDWORD", "unsigned long *", nil, nil,
-                 "unsigned long *", nil, nil],
-      ["WORD",   "unsigned short", nil, nil,
-                 "unsigned short", nil, nil],
-      ["PWORD",  "unsigned int *", nil, nil,
-                 "unsigned int *", nil, nil],
-      ["BYTE",   "unsigned char",   nil, nil,
-                 "unsigned char", nil, nil],
-      ["PBYTE",  "unsigned char *", nil, nil,
-                 "unsigned char *", nil, nil],
-      ["BOOL",   "ibool", nil, nil,
-                 "ibool", nil, nil],
-      ["ATOM",   "int", nil, nil,
-                 "int", nil, nil],
-      ["BYTE",   "unsigned char", nil, nil,
-                 "unsigned char", nil, nil],
-      ["PBYTE",  "unsigned char *", nil, nil,
-                 "unsigned char *", nil, nil],
-      ["UINT",   "unsigned int", nil, nil,
-                 "unsigned int", nil, nil],
-      ["ULONG",  "unsigned long", nil, nil,
-                 "unsigned long", nil, nil],
-      ["UCHAR",  "unsigned char", nil, nil,
-                 "unsigned char", nil, nil],
-      ["HANDLE", "unsigned long", nil, nil,
-                 "unsigned long", nil, nil],
-      ["PHANDLE","void*", nil, nil,
-                 "void*", nil, nil],
-      ["PVOID",  "void*", nil, nil,
-                 "void*", nil, nil],
-      ["LPCSTR", "char*", nil, nil,
-                 "char*", nil, nil],
-      ["HDC",    "unsigned int", nil, nil,
-                 "unsigned int", nil, nil],
-      ["HWND",   "unsigned int", nil, nil,
-                 "unsigned int", nil, nil],
+      ["DWORD",  "unsigned long", nil, nil, nil, nil],
+      ["PDWORD", "unsigned long *", nil, nil, nil, nil],
+      ["WORD",   "unsigned short", nil, nil, nil, nil],
+      ["PWORD",  "unsigned int *", nil, nil, nil, nil],
+      ["BYTE",   "unsigned char",   nil, nil, nil, nil],
+      ["PBYTE",  "unsigned char *", nil, nil, nil, nil],
+      ["BOOL",   "ibool", nil, nil, nil, nil],
+      ["ATOM",   "int", nil, nil, nil, nil],
+      ["BYTE",   "unsigned char", nil, nil, nil, nil],
+      ["PBYTE",  "unsigned char *", nil, nil, nil, nil],
+      ["UINT",   "unsigned int", nil, nil, nil, nil],
+      ["ULONG",  "unsigned long", nil, nil, nil, nil],
+      ["UCHAR",  "unsigned char", nil, nil, nil, nil],
+      ["HANDLE", "unsigned long", nil, nil, nil, nil],
+      ["PHANDLE","void*", nil, nil, nil, nil],
+      ["PVOID",  "void*", nil, nil, nil, nil],
+      ["LPCSTR", "char*", nil, nil, nil, nil],
+      ["HDC",    "unsigned int", nil, nil, nil, nil],
+      ["HWND",   "unsigned int", nil, nil, nil, nil],
       
       # Others
-      ["uint",   "unsigned int", nil, nil,
-                 "unsigned int", nil, nil],
-      ["u_int",  "unsigned int", nil, nil,
-                 "unsigned int", nil, nil],
-      ["ulong",  "unsigned long", nil, nil,
-                 "unsigned long", nil, nil],
-      ["u_long", "unsigned long", nil, nil,
-                 "unsigned long", nil, nil],
+      ["uint",   "unsigned int", nil, nil, nil, nil],
+      ["u_int",  "unsigned int", nil, nil, nil, nil],
+      ["ulong",  "unsigned long", nil, nil, nil, nil],
+      ["u_long", "unsigned long", nil, nil, nil, nil],
 
       # DL::Importable primitive types
-      ["ibool",
-        "I",
+      ["ibool",   "I",
 	proc{|v| v ? 1 : 0},
 	proc{|v| (v != 0) ? true : false},
-        "I",
 	proc{|v| v ? 1 : 0 },
 	proc{|v| (v != 0) ? true : false} ],
-      ["cbool",
-        "C",
+      ["cbool",   "C",
 	proc{|v| v ? 1 : 0},
 	proc{|v| (v != 0) ? true : false},
-        "C",
 	proc{|v,len| v ? 1 : 0},
 	proc{|v,len| (v != 0) ? true : false}],
-      ["lbool",
-        "L",
+      ["lbool",   "L",
 	proc{|v| v ? 1 : 0},
 	proc{|v| (v != 0) ? true : false},
-        "L",
 	proc{|v,len| v ? 1 : 0},
 	proc{|v,len| (v != 0) ? true : false}],
-      ["unsigned char",
-        "C",
+      ["unsigned char", "C",
 	proc{|v| [v].pack("C").unpack("c")[0]},
 	proc{|v| [v].pack("c").unpack("C")[0]},
-        "C",
 	proc{|v| [v].pack("C").unpack("c")[0]},
 	proc{|v| [v].pack("c").unpack("C")[0]}],
-      ["unsigned short",
-        "H",
+      ["unsigned short", "H",
 	proc{|v| [v].pack("S").unpack("s")[0]},
 	proc{|v| [v].pack("s").unpack("S")[0]},
-        "H",
 	proc{|v| [v].pack("S").unpack("s")[0]},
 	proc{|v| [v].pack("s").unpack("S")[0]}],
-      ["unsigned int",
-        "I",
+      ["unsigned int", "I",
 	proc{|v| [v].pack("I").unpack("i")[0]},
 	proc{|v| [v].pack("i").unpack("I")[0]},
-        "I",
 	proc{|v| [v].pack("I").unpack("i")[0]},
 	proc{|v| [v].pack("i").unpack("I")[0]}],
-      ["unsigned long",
-        "L",
+      ["unsigned long", "L",
 	proc{|v| [v].pack("L").unpack("l")[0]},
 	proc{|v| [v].pack("l").unpack("L")[0]},
-        "L",
 	proc{|v| [v].pack("L").unpack("l")[0]},
 	proc{|v| [v].pack("l").unpack("L")[0]}],
-      ["unsigned char ref",
-        "c",
+      ["unsigned char ref", "c",
 	proc{|v| [v].pack("C").unpack("c")[0]},
 	proc{|v| [v].pack("c").unpack("C")[0]},
-	nil, nil, nil],
-      ["unsigned int ref",
-        "i",
+	nil, nil],
+      ["unsigned int ref", "i",
 	proc{|v| [v].pack("I").unpack("i")[0]},
 	proc{|v| [v].pack("i").unpack("I")[0]},
-	nil, nil, nil],
-      ["unsigned long ref",
-        "l",
+	nil, nil],
+      ["unsigned long ref", "l",
 	proc{|v| [v].pack("L").unpack("l")[0]},
 	proc{|v| [v].pack("l").unpack("L")[0]},
-	nil, nil, nil],
-      ["char ref",  "c", nil, nil,
-                    nil, nil, nil],
-      ["short ref", "h", nil, nil,
-                    nil, nil, nil],
-      ["int ref",   "i", nil, nil,
-                    nil, nil, nil],
-      ["long ref",  "l", nil, nil,
-                    nil, nil, nil],
-      ["float ref", "f", nil, nil,
-                    nil, nil, nil],
-      ["double ref","d", nil, nil,
-                    nil, nil, nil],
-      ["char",   "C", nil, nil,
-                 "C", nil, nil],
-      ["short",  "H", nil, nil,
-                 "H", nil, nil],
-      ["int",    "I", nil, nil,
-                 "I", nil, nil],
-      ["long",   "L", nil, nil,
-                 "L", nil, nil],
-      ["float",  "F", nil, nil,
-                 "F", nil, nil],
-      ["double", "D", nil, nil,
-                 "D", nil, nil],
-      [/^char\s*\*$/,"s",nil, nil,
-                     "S",nil, nil],
-      [/^const char\s*\*$/,"S",nil, nil,
-                           "S",nil, nil],
-      [/^.+\*$/,   "P", nil, nil,
-                   "P", nil, nil],
-      [/^.+\[\]$/, "a", nil, nil,
-                   "a", nil, nil],
-      ["void",   "0", nil, nil,
-                 nil, nil, nil],
+	nil, nil],
+      ["char ref",  "c", nil, nil, nil, nil],
+      ["short ref", "h", nil, nil, nil, nil],
+      ["int ref",   "i", nil, nil, nil, nil],
+      ["long ref",  "l", nil, nil, nil, nil],
+      ["float ref", "f", nil, nil, nil, nil],
+      ["double ref","d", nil, nil, nil, nil],
+      ["char",   "C", nil, nil, nil, nil],
+      ["short",  "H", nil, nil, nil, nil],
+      ["int",    "I", nil, nil, nil, nil],
+      ["long",   "L", nil, nil, nil, nil],
+      ["float",  "F", nil, nil, nil, nil],
+      ["double", "D", nil, nil, nil, nil],
+      [/^char\s*\*$/,"s",nil, nil, nil, nil],
+      [/^const char\s*\*$/,"S",nil, nil, nil, nil],
+      [/^.+\*$/,   "p", nil, nil, nil, nil],
+      [/^.+\[\]$/, "a", nil, nil, nil, nil],
+      ["void",   "0", nil, nil, nil, nil],
     ]
 
     def initialize
       init_types()
     end
 
-    def typealias(ty1, ty2, enc=nil, dec=nil, ty3=nil, senc=nil, sdec=nil)
-      @TYDEFS.unshift([ty1, ty2, enc, dec, ty3, senc, sdec])
+    def typealias(ty1, ty2, enc=nil, dec=nil, senc=nil, sdec=nil)
+      @TYDEFS.unshift([ty1,ty2, enc,dec, senc, sdec])
     end
 
     def init_types
       @TYDEFS = TYPES.dup
     end
 
-    def encode_argument_type(alias_type)
-      proc_encode = nil
-      proc_decode = nil
-      @TYDEFS.each{|aty,ty,enc,dec,_,_,_|
-	if( (aty.is_a?(Regexp) && (aty =~ alias_type)) || (aty == alias_type) )
-	  alias_type = alias_type.gsub(aty,ty) if ty
-          alias_type.strip! if alias_type
-	  if( proc_encode )
-	    if( enc )
-	      conv1 = proc_encode
-	      proc_encode = proc{|v| enc.call(conv1.call(v))}
+    def encode_type(ty)
+      orig_ty = ty
+      enc = nil
+      dec = nil
+      senc = nil
+      sdec = nil
+      @TYDEFS.each{|t1,t2,c1,c2,c3,c4|
+#	if( t1.is_a?(String) )
+#	  t1 = Regexp.new("^" + t1 + "$")
+#	end
+	if( (t1.is_a?(Regexp) && (t1 =~ ty)) || (t1 == ty) )
+	  ty = ty.gsub(t1,t2)
+	  if( enc )
+	    if( c1 )
+	      conv1 = enc
+	      enc = proc{|v| c1.call(conv1.call(v))}
 	    end
 	  else
-	    if( enc )
-	      proc_encode = enc
+	    if( c1 )
+	      enc = c1
 	    end
 	  end
-	  if( proc_decode )
-	    if( dec )
-	      conv2 = proc_decode
-	      proc_decode = proc{|v| dec.call(conv2.call(v))}
+	  if( dec )
+	    if( c2 )
+	      conv2 = dec
+	      dec = proc{|v| c2.call(conv2.call(v))}
 	    end
 	  else
-	    if( dec )
-	      proc_decode = dec
+	    if( c2 )
+	      dec = c2
 	    end
 	  end
-	end
-      }
-      return [alias_type, proc_encode, proc_decode]
-    end
-
-    def encode_return_type(ty)
-      ty, enc, dec = encode_argument_type(ty)
-      return [ty, enc, dec]
-    end
-
-    def encode_struct_type(alias_type)
-      proc_encode = nil
-      proc_decode = nil
-      @TYDEFS.each{|aty,_,_,_,ty,enc,dec|
-	if( (aty.is_a?(Regexp) && (aty =~ alias_type)) || (aty == alias_type) )
-	  alias_type = alias_type.gsub(aty,ty) if ty
-          alias_type.strip! if alias_type
-	  if( proc_encode )
-	    if( enc )
-	      conv1 = proc_encode
-	      proc_encode = proc{|v| enc.call(conv1.call(v))}
+	  if( senc )
+	    if( c3 )
+	      conv3 = senc
+	      senc = proc{|v| c3.call(conv3.call(v))}
 	    end
 	  else
-	    if( enc )
-	      proc_encode = enc
+	    if( c3 )
+	      senc = c3
 	    end
 	  end
-	  if( proc_decode )
-	    if( dec )
-	      conv2 = proc_decode
-	      proc_decode = proc{|v| dec.call(conv2.call(v))}
+	  if( sdec )
+	    if( c4 )
+	      conv4 = sdec
+	      sdec = proc{|v| c4.call(conv4.call(v))}
 	    end
 	  else
-	    if( dec )
-	      proc_decode = dec
+	    if( c4 )
+	      sdec = c4
 	    end
 	  end
 	end
       }
-      return [alias_type, proc_encode, proc_decode]
+      ty = ty.strip
+      if( ty.length != 1 )
+	raise(TypeError, "unknown type: #{orig_ty}.")
+      end
+      return [ty,enc,dec,senc,sdec]
     end
   end # end of Types
 end
diff --git a/ext/dl/lib/dl/win32.rb b/ext/dl/lib/dl/win32.rb
index 0fed47c324..92f473d392 100644
--- a/ext/dl/lib/dl/win32.rb
+++ b/ext/dl/lib/dl/win32.rb
@@ -6,7 +6,7 @@ class Win32API
   DLL = {}
 
   def initialize(dllname, func, import, export = "0")
-    prototype = (export + import.to_s).tr("VPpNnLlIi", "0SSI").sub(/^(.)0*$/, '\1')
+    prototype = (export + import.to_s).tr("VPpNnLlIi", "0SSI")
     handle = DLL[dllname] ||= DL::Handle.new(dllname)
     @sym = handle.sym(func, prototype)
   end
diff --git a/ext/dl/mkcallback.rb b/ext/dl/mkcallback.rb
index c9f92e4a0d..b7ea1718d0 100644
--- a/ext/dl/mkcallback.rb
+++ b/ext/dl/mkcallback.rb
@@ -31,9 +31,6 @@ def mkfunc(rettype, fnum, argc)
     subst_code,
     "",
     "  obj = rb_hash_aref(DLFuncTable, rb_assoc_new(INT2NUM(#{rettype.to_s}),INT2NUM(#{fnum.to_s})));",
-    "  if(NIL_P(obj))",
-    "    rb_raise(rb_eDLError, \"callback function does not exist in DL::FuncTable\");",
-    "  Check_Type(obj, T_ARRAY);",
     "  proto = rb_ary_entry(obj, 0);",
     "  proc  = rb_ary_entry(obj, 1);",
     "  Check_Type(proto, T_STRING);",
diff --git a/ext/dl/ptr.c b/ext/dl/ptr.c
index 5c313fad55..32f78c4de5 100644
--- a/ext/dl/ptr.c
+++ b/ext/dl/ptr.c
@@ -1,5 +1,5 @@
 /* -*- C -*-
- * $Id: ptr.c,v 1.19.2.1 2006/05/25 16:37:57 ttate Exp $
+ * $Id$
  */
 
 #include <ruby.h>
@@ -753,32 +753,32 @@ rb_dlptr_aref(int argc, VALUE argv[], VALUE self)
   switch (data->ctype) {
   case DLPTR_CTYPE_STRUCT:
     for (i=0; i < data->ids_num; i++) {
-      switch (data->stype[i]) {
-      case 'I':
-        DLALIGN(data->ptr,offset,INT_ALIGN);
-        break;
-      case 'L':
-        DLALIGN(data->ptr,offset,LONG_ALIGN);
-        break;
-      case 'P':
-      case 'S':
-        DLALIGN(data->ptr,offset,VOIDP_ALIGN);
-        break;
-      case 'F':
-        DLALIGN(data->ptr,offset,FLOAT_ALIGN);
-        break;
-      case 'D':
-        DLALIGN(data->ptr,offset,DOUBLE_ALIGN);
-        break;
-      case 'C':
-        break;
-      case 'H':
-        DLALIGN(data->ptr,offset,SHORT_ALIGN);
-        break;
-      default:
-        rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
-      }
       if (data->ids[i] == id) {
+	switch (data->stype[i]) {
+	case 'I':
+	  DLALIGN(data->ptr,offset,INT_ALIGN);
+	  break;
+	case 'L':
+	  DLALIGN(data->ptr,offset,LONG_ALIGN);
+	  break;
+	case 'P':
+	case 'S':
+	  DLALIGN(data->ptr,offset,VOIDP_ALIGN);
+	  break;
+	case 'F':
+	  DLALIGN(data->ptr,offset,FLOAT_ALIGN);
+	  break;
+	case 'D':
+	  DLALIGN(data->ptr,offset,DOUBLE_ALIGN);
+	  break;
+	case 'C':
+	  break;
+	case 'H':
+	  DLALIGN(data->ptr,offset,SHORT_ALIGN);
+	  break;
+	default:
+	  rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
+	}
 	return cary2ary((char *)data->ptr + offset, data->stype[i], data->ssize[i]);
       }
       switch (data->stype[i]) {
@@ -883,35 +883,34 @@ rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
   case DLPTR_CTYPE_STRUCT:
     offset = 0;
     for (i=0; i < data->ids_num; i++) {
-      switch (data->stype[i]) {
-      case 'I':
-        DLALIGN(data->ptr,offset,INT_ALIGN);
-        break;
-      case 'L':
-        DLALIGN(data->ptr,offset,LONG_ALIGN);
-        break;
-      case 'P':
-      case 'S':
-        DLALIGN(data->ptr,offset,VOIDP_ALIGN);
-        break;
-      case 'D':
-        DLALIGN(data->ptr,offset,DOUBLE_ALIGN);
-        break;
-      case 'F':
-        DLALIGN(data->ptr,offset,FLOAT_ALIGN);
-        break;
-      case 'C':
-        break;
-      case 'H':
-        DLALIGN(data->ptr,offset,SHORT_ALIGN);
-        break;
-      default:
-        rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
-      }
       if (data->ids[i] == id) {
+	switch (data->stype[i]) {
+	case 'I':
+	  DLALIGN(data->ptr,offset,INT_ALIGN);
+	  break;
+	case 'L':
+	  DLALIGN(data->ptr,offset,LONG_ALIGN);
+	  break;
+	case 'P':
+	case 'S':
+	  DLALIGN(data->ptr,offset,VOIDP_ALIGN);
+	  break;
+	case 'D':
+	  DLALIGN(data->ptr,offset,DOUBLE_ALIGN);
+	  break;
+	case 'F':
+	  DLALIGN(data->ptr,offset,FLOAT_ALIGN);
+	  break;
+	case 'C':
+	  break;
+	case 'H':
+	  DLALIGN(data->ptr,offset,SHORT_ALIGN);
+	  break;
+	default:
+	  rb_raise(rb_eDLTypeError, "unsupported type '%c'", data->stype[i]);
+	}
 	memimg = ary2cary(data->stype[i], val, &memsize);
 	memcpy((char *)data->ptr + offset, memimg, memsize);
-        dlfree(memimg);
 	return val;
       }
       switch (data->stype[i]) {
@@ -982,7 +981,6 @@ rb_dlptr_aset(int argc, VALUE argv[], VALUE self)
 	}
 	memimg = ary2cary(data->stype[i], val, NULL);
 	memcpy(data->ptr, memimg, memsize);
-        dlfree(memimg);
       }
     }
     return val;
diff --git a/ext/dl/sym.c b/ext/dl/sym.c
index 6e4337c0b7..c2f5434c61 100644
--- a/ext/dl/sym.c
+++ b/ext/dl/sym.c
@@ -1,5 +1,5 @@
 /* -*- C -*-
- * $Id: sym.c,v 1.24.2.3 2005/06/15 23:39:27 ocean Exp $
+ * $Id$
  */
 
 #include <ruby.h>
@@ -154,9 +154,8 @@ rb_dlsym_initialize(int argc, VALUE argv[], VALUE self)
   rb_scan_args(argc, argv, "12", &addr, &name, &type);
 
   saddr = (void*)(DLNUM2LONG(rb_Integer(addr)));
-  if (!NIL_P(name)) StringValue(name);
+  sname = NIL_P(name) ? NULL : StringValuePtr(name);
   stype = NIL_P(type) ? NULL : StringValuePtr(type);
-  sname = NIL_P(name) ? NULL : RSTRING(name)->ptr;
 
   if( saddr ){
     Data_Get_Struct(self, struct sym_data, data);
@@ -941,7 +940,6 @@ rb_dlsym_call(int argc, VALUE argv[], VALUE self)
     }
   }
 
-  FREE_ARGS;
 #undef FREE_ARGS
   return rb_assoc_new(val,dvals);
 }
diff --git a/ext/dl/test/test.rb b/ext/dl/test/test.rb
index bf8dfc18e3..52be04699f 100644
--- a/ext/dl/test/test.rb
+++ b/ext/dl/test/test.rb
@@ -273,7 +273,7 @@ assert("data_aref", :must,
 
 GC.start
 
-ptr = DL::malloc(32)
+ptr = DL::malloc(1024)
 ptr.struct!("CHIL", "c", "h", "i", "l")
 ptr["c"] = 1
 ptr["h"] = 2
@@ -291,16 +291,5 @@ ptr["n"] = 10
 ptr["ptr"] = nil
 assert("struct!", :must, ptr["n"] == 10 && ptr["ptr"] == nil)
 
-ptr = DL::malloc(16)
-ptr.struct!("CICI", "c1", "i1", "c2", "i2")
-ptr["c1"] = 0xf1
-ptr["c2"] = 0xf2
-c1 = [ptr["c1"]].pack("c").unpack("C")[0]
-c2 = [ptr["c2"]].pack("c").unpack("C")[0]
-assert("struct!", :must,
-  c1 == 0xf1 &&
-  c2 == 0xf2)
-
-
 GC.start
 printf("fail/total = #{$FAIL}/#{$TOTAL}\n")
diff --git a/ext/enumerator/enumerator.c b/ext/enumerator/enumerator.c
index 7b8f109e38..74785569e7 100644
--- a/ext/enumerator/enumerator.c
+++ b/ext/enumerator/enumerator.c
@@ -2,47 +2,23 @@
 
   enumerator.c - provides Enumerator class
 
-  $Author: matz $
+  $Author$
 
   Copyright (C) 2001-2003 Akinori MUSHA
 
   $Idaemons: /home/cvs/rb/enumerator/enumerator.c,v 1.1.1.1 2001/07/15 10:12:48 knu Exp $
   $RoughId: enumerator.c,v 1.6 2003/07/27 11:03:24 nobu Exp $
-  $Id: enumerator.c,v 1.3.2.3 2005/10/24 00:07:00 matz Exp $
+  $Id$
 
 ************************************************/
 
 #include "ruby.h"
 #include "node.h"
 
-/*
- * Document-class: Enumerable::Enumerator
- *
- * A class which provides a method `each' to be used as an Enumerable
- * object.
- */
 static VALUE rb_cEnumerator;
 static ID sym_each, sym_each_with_index, sym_each_slice, sym_each_cons;
 static ID id_new, id_enum_obj, id_enum_method, id_enum_args;
 
-/*
- *  call-seq:
- *    obj.to_enum(method = :each, *args)
- *    obj.enum_for(method = :each, *args)
- *
- *  Returns Enumerable::Enumerator.new(self, method, *args).
- *
- *  e.g.:
- *     str = "xyz"
- *
- *     enum = str.enum_for(:each_byte)
- *     a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
- *
- *     # protects an array from being modified
- *     a = [1, 2, 3]
- *     some_method(a.to_enum)
- *
- */
 static VALUE
 obj_to_enum(obj, enum_args)
     VALUE obj, enum_args;
@@ -52,13 +28,6 @@ obj_to_enum(obj, enum_args)
     return rb_apply(rb_cEnumerator, id_new, enum_args);
 }
 
-/*
- *  call-seq:
- *    enum_with_index
- *
- *  Returns Enumerable::Enumerator.new(self, :each_with_index).
- *
- */
 static VALUE
 enumerator_enum_with_index(obj)
     VALUE obj;
@@ -84,21 +53,6 @@ each_slice_i(val, memo)
     return Qnil;
 }
 
-/*
- *  call-seq:
- *    e.each_slice(n) {...}
- *
- *  Iterates the given block for each slice of <n> elements.
- *
- *  e.g.:
- *      (1..10).each_slice(3) {|a| p a}
- *      # outputs below
- *      [1, 2, 3]
- *      [4, 5, 6]
- *      [7, 8, 9]
- *      [10]
- *
- */
 static VALUE
 enum_each_slice(obj, n)
     VALUE obj, n;
@@ -119,13 +73,6 @@ enum_each_slice(obj, n)
     return Qnil;
 }
 
-/*
- *  call-seq:
- *    e.enum_slice(n)
- *
- *  Returns Enumerable::Enumerator.new(self, :each_slice, n).
- *
- */
 static VALUE
 enumerator_enum_slice(obj, n)
     VALUE obj, n;
@@ -151,26 +98,6 @@ each_cons_i(val, memo)
     return Qnil;
 }
 
-/*
- *  call-seq:
- *    each_cons(n) {...}
- *
- *  Iterates the given block for each array of consecutive <n>
- *  elements.
- *
- *  e.g.:
- *      (1..10).each_cons(3) {|a| p a}
- *      # outputs below
- *      [1, 2, 3]
- *      [2, 3, 4]
- *      [3, 4, 5]
- *      [4, 5, 6]
- *      [5, 6, 7]
- *      [6, 7, 8]
- *      [7, 8, 9]
- *      [8, 9, 10]
- *
- */
 static VALUE
 enum_each_cons(obj, n)
     VALUE obj, n;
@@ -186,13 +113,6 @@ enum_each_cons(obj, n)
     return Qnil;
 }
 
-/*
- *  call-seq:
- *    e.enum_cons(n)
- *
- *  Returns Enumerable::Enumerator.new(self, :each_cons, n).
- *
- */
 static VALUE
 enumerator_enum_cons(obj, n)
     VALUE obj, n;
@@ -200,21 +120,6 @@ enumerator_enum_cons(obj, n)
     return rb_funcall(rb_cEnumerator, id_new, 3, obj, sym_each_cons, n);
 }
 
-/*
- *  call-seq:
- *    Enumerable::Enumerator.new(obj, method = :each, *args)
- *
- *  Creates a new Enumerable::Enumerator object, which is to be
- *  used as an Enumerable object using the given object's given
- *  method with the given arguments.
- *
- *  e.g.:
- *      str = "xyz"
- *
- *      enum = Enumerable::Enumerator.new(str, :each_byte)
- *      a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
- *
- */
 static VALUE
 enumerator_initialize(argc, argv, obj)
     int argc;
@@ -242,14 +147,6 @@ enumerator_iter(memo)
     return rb_apply(memo->u1.value, memo->u2.id, memo->u3.value);
 }
 
-/*
- *  call-seq:
- *    enum.each {...}
- *
- *  Iterates the given block using the object and the method specified
- *  in the first place.
- *
- */
 static VALUE
 enumerator_each(obj)
     VALUE obj;
diff --git a/ext/enumerator/enumerator.txt b/ext/enumerator/enumerator.txt
index 1b84c0c088..64c7d50226 100644
--- a/ext/enumerator/enumerator.txt
+++ b/ext/enumerator/enumerator.txt
@@ -1,7 +1,7 @@
 .\" enumerator.txt -  -*- Indented-Text -*-
 $Idaemons: /home/cvs/rb/enumerator/enumerator.txt,v 1.2 2001/07/15 10:19:24 knu Exp $
 $RoughId: enumerator.txt,v 1.5 2003/02/20 12:24:51 knu Exp $
-$Id: enumerator.txt,v 1.2 2003/10/17 14:09:43 knu Exp $
+$Id$
 
 ** Enumerable::Enumerator(Class)
 
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index 084405408f..c42f279d58 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -2,8 +2,8 @@
 
   etc.c -
 
-  $Author: shyouhei $
-  $Date: 2007/01/09 12:24:20 $
+  $Author$
+  $Date$
   created at: Tue Mar 22 18:39:19 JST 1994
 
 ************************************************/
@@ -23,10 +23,6 @@
 #include <grp.h>
 #endif
 
-#ifndef HAVE_TYPE_UID_T
-#define uid_t int
-#endif
-
 static VALUE sPasswd, sGroup;
 
 #ifndef _WIN32
@@ -34,11 +30,6 @@ char *getenv();
 #endif
 char *getlogin();
 
-/* Returns the short user name of the currently logged in user.
- *
- * e.g.
- *   Etc.getlogin -> 'guest'
- */
 static VALUE
 etc_getlogin(obj)
     VALUE obj;
@@ -79,21 +70,21 @@ setup_passwd(pwd)
 #ifdef HAVE_ST_PW_PASSWD
 			 safe_setup_str(pwd->pw_passwd),
 #endif
-			 PW_UID2VAL(pwd->pw_uid),
-			 PW_GID2VAL(pwd->pw_gid),
+			 INT2FIX(pwd->pw_uid),
+			 INT2FIX(pwd->pw_gid),
 #ifdef HAVE_ST_PW_GECOS
 			 safe_setup_str(pwd->pw_gecos),
 #endif
 			 safe_setup_str(pwd->pw_dir),
 			 safe_setup_str(pwd->pw_shell),
 #ifdef HAVE_ST_PW_CHANGE
-			 INT2NUM(pwd->pw_change),
+			 INT2FIX(pwd->pw_change),
 #endif
 #ifdef HAVE_ST_PW_QUOTA
-			 INT2NUM(pwd->pw_quota),
+			 INT2FIX(pwd->pw_quota),
 #endif
 #ifdef HAVE_ST_PW_AGE
-			 PW_AGE2VAL(pwd->pw_age),
+			 INT2FIX(pwd->pw_age),
 #endif
 #ifdef HAVE_ST_PW_CLASS
 			 safe_setup_str(pwd->pw_class),
@@ -102,22 +93,13 @@ setup_passwd(pwd)
 			 safe_setup_str(pwd->pw_comment),
 #endif
 #ifdef HAVE_ST_PW_EXPIRE
-			 INT2NUM(pwd->pw_expire),
+			 INT2FIX(pwd->pw_expire),
 #endif
 			 0		/*dummy*/
 	);
 }
 #endif
 
-/* Returns the /etc/passwd information for the user with specified integer
- * user id (uid).
- *
- * The information is returned as a Struct::Passwd; see getpwent above for
- * details.
- *
- * e.g.  * Etc.getpwuid(0) -> #<struct Struct::Passwd name="root",
- * passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
- */
 static VALUE
 etc_getpwuid(argc, argv, obj)
     int argc;
@@ -126,12 +108,12 @@ etc_getpwuid(argc, argv, obj)
 {
 #if defined(HAVE_GETPWENT)
     VALUE id;
-    uid_t uid;
+    int uid;
     struct passwd *pwd;
 
     rb_secure(4);
     if (rb_scan_args(argc, argv, "01", &id) == 1) {
-	uid = PW_VAL2UID(id);
+	uid = NUM2INT(id);
     }
     else {
 	uid = getuid();
@@ -144,14 +126,6 @@ etc_getpwuid(argc, argv, obj)
 #endif
 }
 
-/* Returns the /etc/passwd information for the user with specified login name.
- *
- * The information is returned as a Struct::Passwd; see getpwent above for
- * details.
- *
- * e.g.  * Etc.getpwnam('root') -> #<struct Struct::Passwd name="root",
- * passwd="x", uid=0, gid=0, gecos="root",dir="/root", shell="/bin/bash">
- */
 static VALUE
 etc_getpwnam(obj, nam)
     VALUE obj, nam;
@@ -191,21 +165,6 @@ passwd_iterate()
 }
 #endif
 
-/* Provides a convenient Ruby iterator which executes a block for each entry 
- * in the /etc/passwd file.
- *
- * The code block is passed an Etc::Passwd struct; see getpwent above for 
- * details.
- *
- * Example:
- *
- *     require 'etc'
- *
- *     Etc.passwd {|u|
- *       puts u.name + " = " + u.gecos
- *     }
- *
- */
 static VALUE
 etc_passwd(obj)
     VALUE obj;
@@ -228,9 +187,6 @@ etc_passwd(obj)
     return Qnil;
 }
 
-/* Resets the process of reading the /etc/passwd file, so that the next call
- * to getpwent will return the first entry again.
- */
 static VALUE
 etc_setpwent(obj)
     VALUE obj;
@@ -241,9 +197,6 @@ etc_setpwent(obj)
     return Qnil;
 }
 
-/* Ends the process of scanning through the /etc/passwd file begun with
- * getpwent, and closes the file.
- */
 static VALUE
 etc_endpwent(obj)
     VALUE obj;
@@ -254,32 +207,6 @@ etc_endpwent(obj)
     return Qnil;
 }
 
-/* Returns an entry from the /etc/passwd file. The first time it is called it
- * opens the file and returns the first entry; each successive call returns 
- * the next entry, or nil if the end of the file has been reached.
- *
- * To close the file when processing is complete, call endpwent.
- *
- * Each entry is returned as a Struct::Passwd:
- *
- * - Passwd#name contains the short login name of the user as a String.
- *
- * - Passwd#passwd contains the encrypted password of the user as a String.
- *   an 'x' is returned if shadow passwords are in use. An '*' is returned
- *   if the user cannot log in using a password.
- *
- * - Passwd#uid contains the integer user ID (uid) of the user.
- *
- * - Passwd#gid contains the integer group ID (gid) of the user's primary group.
- *
- * - Passwd#gecos contains a longer String description of the user, such as 
- *   a full name. Some Unix systems provide structured information in the 
- *   gecos field, but this is system-dependent.
- *
- * - Passwd#dir contains the path to the home directory of the user as a String.
- *
- * - Passwd#shell contains the path to the login shell of the user as a String.
- */
 static VALUE
 etc_getpwent(obj)
     VALUE obj;
@@ -313,31 +240,21 @@ setup_group(grp)
 #ifdef HAVE_ST_GR_PASSWD
 			 safe_setup_str(grp->gr_passwd),
 #endif
-			 PW_GID2VAL(grp->gr_gid),
+			 INT2FIX(grp->gr_gid),
 			 mem);
 }
 #endif
 
-/* Returns information about the group with specified integer group id (gid), 
- * as found in /etc/group.
- *
- * The information is returned as a Struct::Group; see getgrent above for
- * details.
- *
- * e.g.  Etc.getgrgid(100) -> #<struct Struct::Group name="users", passwd="x",
- * gid=100, mem=["meta", "root"]>
- *
- */
 static VALUE
 etc_getgrgid(obj, id)
     VALUE obj, id;
 {
 #ifdef HAVE_GETGRENT
-    gid_t gid;
+    int gid;
     struct group *grp;
 
     rb_secure(4);
-    gid = PW_VAL2GID(id);
+    gid = NUM2INT(id);
     grp = getgrgid(gid);
     if (grp == 0) rb_raise(rb_eArgError, "can't find group for %d", gid);
     return setup_group(grp);
@@ -346,16 +263,6 @@ etc_getgrgid(obj, id)
 #endif
 }
 
-/* Returns information about the group with specified String name, as found 
- * in /etc/group.
- *
- * The information is returned as a Struct::Group; see getgrent above for
- * details.
- *
- * e.g.  Etc.getgrnam('users') -> #<struct Struct::Group name="users",
- * passwd="x", gid=100, mem=["meta", "root"]>
- *
- */
 static VALUE
 etc_getgrnam(obj, nam)
     VALUE obj, nam;
@@ -396,21 +303,6 @@ group_iterate()
 }
 #endif
 
-/* Provides a convenient Ruby iterator which executes a block for each entry 
- * in the /etc/group file.
- *
- * The code block is passed an Etc::Group struct; see getgrent above for 
- * details.
- *
- * Example:
- *
- *     require 'etc'
- *
- *     Etc.group {|g|
- *       puts g.name + ": " + g.mem.join(', ')
- *     }
- *
- */
 static VALUE
 etc_group(obj)
     VALUE obj;
@@ -433,9 +325,6 @@ etc_group(obj)
     return Qnil;
 }
 
-/* Resets the process of reading the /etc/group file, so that the next call
- * to getgrent will return the first entry again.
- */
 static VALUE
 etc_setgrent(obj)
     VALUE obj;
@@ -446,9 +335,6 @@ etc_setgrent(obj)
     return Qnil;
 }
 
-/* Ends the process of scanning through the /etc/group file begun by 
- * getgrent, and closes the file.
- */
 static VALUE
 etc_endgrent(obj)
     VALUE obj;
@@ -459,26 +345,6 @@ etc_endgrent(obj)
     return Qnil;
 }
 
-/* Returns an entry from the /etc/group file. The first time it is called it
- * opens the file and returns the first entry; each successive call returns 
- * the next entry, or nil if the end of the file has been reached.
- *
- * To close the file when processing is complete, call endgrent.
- *
- * Each entry is returned as a Struct::Group:
- *
- * - Group#name contains the name of the group as a String.
- *
- * - Group#passwd contains the encrypted password as a String. An 'x' is
- *   returned if password access to the group is not available; an empty 
- *   string is returned if no password is needed to obtain membership of 
- *   the group.
- *
- * - Group#gid contains the group's numeric ID as an integer.
- *
- * - Group#mem is an Array of Strings containing the short login names of the 
- *   members of the group.
- */
 static VALUE
 etc_getgrent(obj)
     VALUE obj;
@@ -495,11 +361,6 @@ etc_getgrent(obj)
 
 static VALUE mEtc;
 
-/* The etc module provides access to information from the /etc/passwd and
- * /etc/group files on Linux and Unix systems.
- *
- * Documented by mathew <meta@pobox.com>.
- */
 void
 Init_etc()
 {
@@ -521,7 +382,6 @@ Init_etc()
     rb_define_module_function(mEtc, "endgrent", etc_endgrent, 0);
     rb_define_module_function(mEtc, "getgrent", etc_getgrent, 0);
 
-    rb_global_variable(&sPasswd);
     sPasswd =  rb_struct_define("Passwd",
 				"name", "passwd", "uid", "gid",
 #ifdef HAVE_ST_PW_GECOS
@@ -547,13 +407,10 @@ Init_etc()
 				"expire",
 #endif
 				NULL);
+    rb_global_variable(&sPasswd);
 
 #ifdef HAVE_GETGRENT
+    sGroup = rb_struct_define("Group", "name", "passwd", "gid", "mem", NULL);
     rb_global_variable(&sGroup);
-    sGroup = rb_struct_define("Group", "name",
-#ifdef HAVE_ST_GR_PASSWD
-			      "passwd",
-#endif
-			      "gid", "mem", NULL);
 #endif
 }
diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb
index dbd0672545..16f2da352b 100644
--- a/ext/etc/extconf.rb
+++ b/ext/etc/extconf.rb
@@ -8,36 +8,11 @@ if  a or b or c
   have_struct_member('struct passwd', 'pw_gecos', 'pwd.h')
   have_struct_member('struct passwd', 'pw_change', 'pwd.h')
   have_struct_member('struct passwd', 'pw_quota', 'pwd.h')
-  if have_struct_member('struct passwd', 'pw_age', 'pwd.h')
-    case what_type?('struct passwd', 'pw_age', 'pwd.h')
-    when "string"
-      f = "safe_setup_str"
-    when "long long"
-      f = "LL2NUM"
-    else
-      f = "INT2NUM"
-    end
-    $defs.push("-DPW_AGE2VAL="+f)
-  end
+  have_struct_member('struct passwd', 'pw_age', 'pwd.h')
   have_struct_member('struct passwd', 'pw_class', 'pwd.h')
   have_struct_member('struct passwd', 'pw_comment', 'pwd.h') unless /cygwin/ === RUBY_PLATFORM
   have_struct_member('struct passwd', 'pw_expire', 'pwd.h')
   have_struct_member('struct passwd', 'pw_passwd', 'pwd.h')
   have_struct_member('struct group', 'gr_passwd', 'grp.h')
-  [%w"uid_t pwd.h", %w"gid_t grp.h"].each do |t, *h|
-    h.unshift("sys/types.h")
-    f = "INT2NUM"
-    if have_type(t, h)
-      if try_static_assert("sizeof(#{t}) > sizeof(long)", h)
-	f = "LL2NUM"
-      end
-      if try_static_assert("(#{t})-1 > 0", h)
-	f = "U#{f}"
-      end
-    end
-    t = t.chomp('_t').upcase
-    $defs.push("-DPW_#{t}2VAL=#{f}")
-    $defs.push("-DPW_VAL2#{t}=#{f.sub(/([A-Z]+)2(NUM)/, '\22\1')}")
-  end
   create_makefile("etc")
 end
diff --git a/ext/extmk.rb b/ext/extmk.rb
index bbcb3c09b8..5d26b43e13 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -16,74 +16,26 @@ alias $PROGRAM_NAME $0
 alias $0 $progname
 
 $extlist = []
-$compiled = {}
 
-$:.replace([Dir.pwd])
+$:.replace ["."]
 require 'rbconfig'
 
 srcdir = File.dirname(File.dirname(__FILE__))
 
-$:.unshift(srcdir, File.expand_path("lib", srcdir))
+$:.replace [srcdir, srcdir+"/lib", "."]
+
+require 'mkmf'
+require 'getopts'
 
 $topdir = "."
 $top_srcdir = srcdir
-
-require 'mkmf'
-require 'optparse/shellwords'
+$hdrdir = $top_srcdir
 
 def sysquote(x)
   @quote ||= /human|os2|macos/ =~ (CROSS_COMPILING || RUBY_PLATFORM)
   @quote ? x.quote : x
 end
 
-def relative_from(path, base)
-  dir = File.join(path, "")
-  if File.expand_path(dir) == File.expand_path(dir, base)
-    path
-  else
-    File.join(base, path)
-  end
-end
-
-def extract_makefile(makefile, keep = true)
-  m = File.read(makefile)
-  if !(target = m[/^TARGET[ \t]*=[ \t]*(\S*)/, 1])
-    return keep
-  end
-  installrb = {}
-  m.scan(/^install-rb-default:[ \t]*(\S+)\n\1:[ \t]*(\S+)/) {installrb[$2] = $1}
-  oldrb = installrb.keys.sort
-  newrb = install_rb(nil, "").collect {|d, *f| f}.flatten.sort
-  if target_prefix = m[/^target_prefix[ \t]*=[ \t]*\/(.*)/, 1]
-    target = "#{target_prefix}/#{target}"
-  end
-  unless oldrb == newrb
-    if $extout
-      newrb.each {|f| installrb.delete(f)}
-      unless installrb.empty?
-        config = CONFIG.dup
-        install_dirs(target_prefix).each {|var, val| config[var] = val}
-        FileUtils.rm_f(installrb.values.collect {|f| Config.expand(f, config)}, :verbose => true)
-      end
-    end
-    return false
-  end
-  $target = target
-  $extconf_h = m[/^RUBY_EXTCONF_H[ \t]*=[ \t]*(\S+)/, 1]
-  $static ||= m[/^EXTSTATIC[ \t]*=[ \t]*(\S+)/, 1] || false
-  /^STATIC_LIB[ \t]*=[ \t]*\S+/ =~ m or $static = nil
-  $preload = Shellwords.shellwords(m[/^preload[ \t]*=[ \t]*(.*)/, 1] || "")
-  $DLDFLAGS += " " + (m[/^DLDFLAGS[ \t]*=[ \t]*(.*)/, 1] || "")
-  if s = m[/^LIBS[ \t]*=[ \t]*(.*)/, 1]
-    s.sub!(/^#{Regexp.quote($LIBRUBYARG)} */, "")
-    s.sub!(/ *#{Regexp.quote($LIBS)}$/, "")
-    $libs = s
-  end
-  $LOCAL_LIBS = m[/^LOCAL_LIBS[ \t]*=[ \t]*(.*)/, 1] || ""
-  $LIBPATH = Shellwords.shellwords(m[/^libpath[ \t]*=[ \t]*(.*)/, 1] || "") - %w[$(libdir) $(topdir)]
-  true
-end
-
 def extmake(target)
   print "#{$message} #{target}\n"
   $stdout.flush
@@ -97,43 +49,35 @@ def extmake(target)
     return true if $nodynamic and not $static
   end
 
-  FileUtils.mkpath target unless File.directory?(target)
+  init_mkmf
+
   begin
     dir = Dir.pwd
     FileUtils.mkpath target unless File.directory?(target)
     Dir.chdir target
     top_srcdir = $top_srcdir
     topdir = $topdir
-    mk_srcdir = CONFIG["srcdir"]
-    mk_topdir = CONFIG["topdir"]
     prefix = "../" * (target.count("/")+1)
-    $hdrdir = $top_srcdir = relative_from(top_srcdir, prefix)
+    if File.expand_path(top_srcdir) != File.expand_path(top_srcdir, dir)
+      $hdrdir = $top_srcdir = prefix + top_srcdir
+    end
     $topdir = prefix + $topdir
     $target = target
     $mdir = target
     $srcdir = File.join($top_srcdir, "ext", $mdir)
     $preload = nil
-    $compiled[target] = false
     makefile = "./Makefile"
-    ok = File.exist?(makefile)
     unless $ignore
-      Config::CONFIG["hdrdir"] = $hdrdir
-      Config::CONFIG["srcdir"] = $srcdir
-      Config::CONFIG["topdir"] = $topdir
-      CONFIG["hdrdir"] = ($hdrdir == top_srcdir) ? top_srcdir : "$(topdir)"+top_srcdir[2..-1]
-      CONFIG["srcdir"] = "$(hdrdir)/ext/#{$mdir}"
-      CONFIG["topdir"] = $topdir
-      begin
-	$extconf_h = nil
-	ok &&= extract_makefile(makefile)
-	if (($extconf_h && !File.exist?($extconf_h)) ||
-	    !(t = modified?(makefile, MTIMES)) ||
-            %W"#{$srcdir}/makefile.rb #{$srcdir}/extconf.rb #{$srcdir}/depend".any? {|f| modified?(f, [t])})
-        then
-	  ok = false
-          init_mkmf
-	  Logging::logfile 'mkmf.log'
-	  rm_f makefile
+      if $static ||
+	 !(t = modified?(makefile, MTIMES)) ||
+	 %W<#{$srcdir}/makefile.rb #{$srcdir}/extconf.rb
+	    #{$srcdir}/depend>.any? {|f| modified?(f, [t])}
+      then
+	$defs = []
+	Logging::logfile 'mkmf.log'
+	Config::CONFIG["srcdir"] = $srcdir
+	rm_f makefile
+	begin
 	  if File.exist?($0 = "#{$srcdir}/makefile.rb")
 	    load $0
 	  elsif File.exist?($0 = "#{$srcdir}/extconf.rb")
@@ -141,119 +85,64 @@ def extmake(target)
 	  else
 	    create_makefile(target)
 	  end
-	  $defs << "-DRUBY_EXPORT" if $static
-	  ok = File.exist?(makefile)
+	  File.exist?(makefile)
+	rescue SystemExit
+	  # ignore
+	ensure
+	  rm_f "conftest*"
+	  $0 = $PROGRAM_NAME
+	  Config::CONFIG["srcdir"] = $top_srcdir
 	end
-      rescue SystemExit
-	# ignore
-      ensure
-	rm_f "conftest*"
-	config = $0
-	$0 = $PROGRAM_NAME
-      end
-    end
-    ok = yield(ok) if block_given?
-    unless ok
-      open(makefile, "w") do |f|
-	f.print dummy_makefile(CONFIG["srcdir"])
+      else
+	true
       end
+    else
+      File.exist?(makefile)
+    end or open(makefile, "w") do |f|
+      f.print dummy_makefile($srcdir)
       return true
     end
     args = sysquote($mflags)
-    unless $destdir.to_s.empty? or $mflags.include?("DESTDIR")
-      args += [sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))]
-    end
     if $static
-      args += ["static"] unless $clean
+      args += ["static"]
       $extlist.push [$static, $target, File.basename($target), $preload]
     end
     unless system($make, *args)
       $ignore or $continue or return false
     end
-    $compiled[target] = true
-    if $clean and $clean != true
-      File.unlink(makefile) rescue nil
-    end
     if $static
       $extflags ||= ""
       $extlibs ||= []
       $extpath ||= []
-      unless $mswin
-        $extflags = ($extflags.split | $DLDFLAGS.split | $LDFLAGS.split).join(" ")
-      end
+      $extflags += " " + $DLDFLAGS unless $DLDFLAGS.empty?
+      $extflags += " " + $LDFLAGS unless $LDFLAGS.empty?
       $extlibs = merge_libs($extlibs, $libs.split, $LOCAL_LIBS.split)
       $extpath |= $LIBPATH
     end
   ensure
-    Config::CONFIG["srcdir"] = $top_srcdir
-    Config::CONFIG["topdir"] = topdir
-    CONFIG["srcdir"] = mk_srcdir
-    CONFIG["topdir"] = mk_topdir
-    CONFIG.delete("hdrdir")
     $hdrdir = $top_srcdir = top_srcdir
     $topdir = topdir
     Dir.chdir dir
   end
-  begin
-    Dir.rmdir target
-    target = File.dirname(target)
-  rescue SystemCallError
-    break
-  end while true
   true
 end
 
-def compiled?(target)
-  $compiled[target]
-end
-
 def parse_args()
-  $mflags = []
-
-  opts = nil
-  $optparser ||= OptionParser.new do |opts|
-    opts.on('-n') {$dryrun = true}
-    opts.on('--[no-]extension [EXTS]', Array) do |v|
-      $extension = (v == false ? [] : v)
-    end
-    opts.on('--[no-]extstatic [STATIC]', Array) do |v|
-      if ($extstatic = v) == false
-        $extstatic = []
-      elsif v
-        $force_static = true if $extstatic.delete("static")
-        $extstatic = nil if $extstatic.empty?
-      end
-    end
-    opts.on('--dest-dir=DIR') do |v|
-      $destdir = v
-    end
-    opts.on('--extout=DIR') do |v|
-      $extout = (v unless v.empty?)
-    end
-    opts.on('--make=MAKE') do |v|
-      $make = v || 'make'
-    end
-    opts.on('--make-flags=FLAGS', '--mflags', Shellwords) do |v|
-      v.grep(/\A([-\w]+)=(.*)/) {$configure_args["--#{$1}"] = $2}
-      if arg = v.first
-        arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg
-      end
-      $mflags.concat(v)
-    end
-    opts.on('--message [MESSAGE]', String) do |v|
-      $message = v
-    end
-  end
-  begin
-    $optparser.parse!(ARGV)
-  rescue OptionParser::InvalidOption => e
-    retry if /^--/ =~ e.args[0]
-    $optparser.warn(e)
-    abort opts.to_s
+  getopts('n', 'extstatic:', 'dest-dir:',
+	  'make:', 'make-flags:', 'mflags:')
+
+  $dryrun = $OPT['n']
+  $force_static = $OPT['extstatic'] == 'static'
+  $destdir = $OPT['dest-dir'] || ''
+  $make = $OPT['make'] || $make || 'make'
+  mflags = ($OPT['make-flags'] || '').strip
+  mflags = ($OPT['mflags'] || '').strip if mflags.empty?
+
+  $mflags = Shellwords.shellwords(mflags)
+  if arg = $mflags.first
+    arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg
   end
 
-  $destdir ||= ''
-
   $make, *rest = Shellwords.shellwords($make)
   $mflags.unshift(*rest) unless rest.empty?
 
@@ -261,10 +150,6 @@ def parse_args()
     grep(/\A-(?!-).*#{'%c' % flag}/i) { return true }
     false
   end
-  def $mflags.defined?(var)
-    grep(/\A#{var}=(.*)/) {return $1}
-    false
-  end
 
   if $mflags.set?(?n)
     $dryrun = true
@@ -273,33 +158,25 @@ def parse_args()
   end
 
   $continue = $mflags.set?(?k)
-  if $extout
-    $extout = '$(topdir)/'+$extout
-    $extout_prefix = $extout ? "$(extout)$(target_prefix)/" : ""
-    $mflags << "extout=#$extout" << "extout_prefix=#$extout_prefix"
-  end
+  $mflags |= ["DESTDIR=#{$destdir}"]
 end
 
 parse_args()
 
-if target = ARGV.shift and /^[a-z-]+$/ =~ target
-  $mflags.push(target)
-  target = target.sub(/^(dist|real)(?=(?:clean)?$)/, '')
-  case target
-  when /clean/
-    $ignore ||= true
-    $clean = $1 ? $1[0] : true
-  when /^install\b/
-    $install = true
-    $ignore ||= true
-    $mflags.unshift("INSTALL_PROG=install -c -p -m 0755",
-                    "INSTALL_DATA=install -c -p -m 0644",
-                    "MAKEDIRS=mkdir -p") if $dryrun
-  end
-end
 unless $message
-  if target
-    $message = target.sub(/^(\w+)e?\b/, '\1ing').tr('-', ' ')
+  if $message = ARGV.shift and /^[a-z]+$/ =~ $message
+    $mflags.push($message)
+    $message = $message.sub(/^(?:dist|real)(?=(?:clean)?$)/, '\1')
+    case $message
+    when "clean"
+      $ignore ||= true
+    when "install"
+      $ignore ||= true
+      $mflags.unshift("INSTALL_PROG=install -c -p -m 0755",
+		      "INSTALL_DATA=install -c -p -m 0644",
+		      "MAKEDIRS=mkdir -p") if $dryrun
+    end
+    $message.sub!(/e?$/, "ing")
   else
     $message = "compiling"
   end
@@ -308,28 +185,22 @@ end
 EXEEXT = CONFIG['EXEEXT']
 if CROSS_COMPILING
   $ruby = CONFIG['MINIRUBY']
-elsif sep = config_string('BUILD_FILE_SEPARATOR')
-  $ruby = "$(topdir:/=#{sep})#{sep}miniruby" + EXEEXT
+elsif $nmake
+  $ruby = '$(topdir:/=\\)\\miniruby' + EXEEXT
 else
   $ruby = '$(topdir)/miniruby' + EXEEXT
 end
-$ruby << " -I'$(topdir)' -I'$(hdrdir)/lib'"
+$ruby << " -I$(topdir) -I$(hdrdir)/lib"
 $config_h = '$(topdir)/config.h'
 
 MTIMES = [__FILE__, 'rbconfig.rb', srcdir+'/lib/mkmf.rb'].collect {|f| File.mtime(f)}
 
 # get static-link modules
 $static_ext = {}
-if $extstatic
-  $extstatic.each do |target|
-    target = target.downcase if /mswin32|bccwin32/ =~ RUBY_PLATFORM
-    $static_ext[target] = $static_ext.size
-  end
-end
 for dir in ["ext", File::join($top_srcdir, "ext")]
   setup = File::join(dir, CONFIG['setup'])
   if File.file? setup
-    f = open(setup)
+    f = open(setup) 
     while line = f.gets()
       line.chomp!
       line.sub!(/#.*$/, '')
@@ -343,80 +214,34 @@ for dir in ["ext", File::join($top_srcdir, "ext")]
 	next
       end
       target = target.downcase if /mswin32|bccwin32/ =~ RUBY_PLATFORM
-      $static_ext[target] = $static_ext.size
+      $static_ext[target] = true
     end
     MTIMES << f.mtime
     $setup = setup
     f.close
     break
   end
-end unless $extstatic
-
-ext_prefix = "#{$top_srcdir}/ext"
-exts = $static_ext.sort_by {|t, i| i}.collect {|t, i| t}
-if $extension
-  exts |= $extension.select {|d| File.directory?("#{ext_prefix}/#{d}")}
-else
-  withes, withouts = %w[--with --without].collect {|w|
-    if not (w = %w[-extensions -ext].collect {|opt|arg_config(w+opt)}).any?
-      proc {false}
-    elsif (w = w.grep(String)).empty?
-      proc {true}
-    else
-      w.collect {|opt| opt.split(/,/)}.flatten.method(:any?)
-    end
-  }
-  cond = proc {|ext|
-    cond1 = proc {|n| File.fnmatch(n, ext, File::FNM_PATHNAME)}
-    withes.call(&cond1) or !withouts.call(&cond1)
-  }
-  exts |= Dir.glob("#{ext_prefix}/*/**/extconf.rb").collect {|d|
-    d = File.dirname(d)
-    d.slice!(0, ext_prefix.length + 1)
-    d
-  }.find_all {|ext|
-    with_config(ext, &cond)
-  }.sort
-end
-
-if $extout
-  Config.expand(extout = "#$extout", Config::CONFIG.merge("topdir"=>$topdir))
-  if $install
-    dest = Config.expand($rubylibdir.dup)
-    unless $destdir.empty?
-      dest.sub!($dest_prefix_pattern, Config.expand($destdir.dup))
-    end
-    FileUtils.cp_r(extout+"/.", dest, :verbose => true, :noop => $dryrun)
-    exit
-  end
-  unless $ignore
-    FileUtils.mkpath(extout)
-  end
 end
 
 dir = Dir.pwd
 FileUtils::makedirs('ext')
 Dir::chdir('ext')
 
-$hdrdir = $top_srcdir = relative_from(srcdir, $topdir = "..")
-exts.each do |d|
-  extmake(d) or abort
+if File.expand_path(srcdir) != File.expand_path(srcdir, dir)
+  $hdrdir = $top_srcdir = "../" + srcdir
+end
+$topdir = ".."
+ext_prefix = "#{$top_srcdir}/ext"
+Dir.glob("#{ext_prefix}/*/**/extconf.rb") do |d|
+  d = File.dirname(d)
+  d.slice!(0, ext_prefix.length + 1)
+  extmake(d) or exit(1)
 end
 $hdrdir = $top_srcdir = srcdir
 $topdir = "."
 
-extinit = Struct.new(:c, :o) {
-  def initialize(src)
-    super("#{src}.c", "#{src}.#{$OBJEXT}")
-  end
-}.new("extinit")
 if $ignore
-  FileUtils.rm_f(extinit.to_a) if $clean
   Dir.chdir ".."
-  if $clean
-    Dir.rmdir('ext') rescue nil
-    FileUtils.rm_rf(extout) if $extout
-  end
   exit
 end
 
@@ -442,24 +267,23 @@ if $extlist.size > 0
     end
   end
 
-  src = %{\
+  src = <<SRC
 extern char *ruby_sourcefile, *rb_source_filename();
 #define init(func, name) (ruby_sourcefile = src = rb_source_filename(name), func(), rb_provide(src))
 void Init_ext() {\n\tchar* src;\n#$extinit}
-}
-  if !modified?(extinit.c, MTIMES) || IO.read(extinit.c) != src
-    open(extinit.c, "w") {|f| f.print src}
+SRC
+  if !modified?("extinit.c", MTIMES) || IO.read("extinit.c") != src
+    open("extinit.c", "w") {|f| f.print src}
   end
 
-  $extobjs = "ext/#{extinit.o} " + $extobjs
+  $extobjs = "ext/extinit.#{$OBJEXT} " + $extobjs
   if RUBY_PLATFORM =~ /m68k-human|beos/
     $extflags.delete("-L/usr/local/lib")
   end
   $extpath.delete("$(topdir)")
   $extflags = libpathflag($extpath) << " " << $extflags.strip
   conf = [
-    ['SETUP', $setup],
-    [enable_config("shared", $enable_shared) ? 'DLDOBJS' : 'EXTOBJS', $extobjs],
+    ['SETUP', $setup], [$enable_shared ? 'DLDOBJS' : 'EXTOBJS', $extobjs],
     ['EXTLIBS', $extlibs.join(' ')], ['EXTLDFLAGS', $extflags]
   ].map {|n, v|
     "#{n}=#{v}" if v and !(v = v.strip).empty?
@@ -467,32 +291,20 @@ void Init_ext() {\n\tchar* src;\n#$extinit}
   puts conf
   $stdout.flush
   $mflags.concat(conf)
-else
-  FileUtils.rm_f(extinit.to_a)
 end
 rubies = []
-%w[RUBY RUBYW STATIC_RUBY].each {|r|
-  n = r
-  if r = arg_config("--"+r.downcase) || config_string(r+"_INSTALL_NAME")
-    rubies << r+EXEEXT
-    $mflags << "#{n}=#{r}"
-  end
+%w[RUBY RUBYW].each {|r|
+  config_string(r+"_INSTALL_NAME") {|r| rubies << r+EXEEXT}
 }
 
 Dir.chdir ".."
-unless $destdir.to_s.empty?
-  $mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
-end
-unless $extlist.empty?
+if $extlist.size > 0
   rm_f(Config::CONFIG["LIBRUBY_SO"])
 end
 puts "making #{rubies.join(', ')}"
 $stdout.flush
 $mflags.concat(rubies)
 
-if $nmake == ?b
-  $mflags.collect {|flag| flag.sub!(/\A(?=\w+=)/, "-D")}
-end
 system($make, *sysquote($mflags)) or exit($?.exitstatus)
 
 #Local variables:
diff --git a/ext/fcntl/fcntl.c b/ext/fcntl/fcntl.c
index 8f9cb43d0c..d48630fc66 100644
--- a/ext/fcntl/fcntl.c
+++ b/ext/fcntl/fcntl.c
@@ -2,7 +2,7 @@
 
   fcntl.c -
 
-  $Author: matz $
+  $Author$
   created at: Mon Apr  7 18:53:05 JST 1997
 
   Copyright (C) 1997-2001 Yukihiro Matsumoto
@@ -34,81 +34,6 @@ pack up your own arguments to pass as args for locking functions, etc.
 #include "ruby.h"
 #include <fcntl.h>
 
-/* Fcntl loads the constants defined in the system's <fcntl.h> C header
- * file, and used with both the fcntl(2) and open(2) POSIX system calls.
- *
- * Copyright (C) 1997-2001 Yukihiro Matsumoto
- *
- * Documented by mathew <meta@pobox.com>
- *
- * = Usage
- * 
- * To perform a fcntl(2) operation, use IO::fcntl in the core classes.
- *
- * To perform an open(2) operation, use IO::sysopen.
- *
- * The set of operations and constants available depends upon specific OS
- * platform. Some values listed below may not be supported on your system.
- *
- * The constants supported by Ruby for use with IO::fcntl are:
- *
- * - F_DUPFD - duplicate a close-on-exec file handle to a non-close-on-exec
- *   file handle.
- *
- * - F_GETFD - read the close-on-exec flag of a file handle.
- *
- * - F_SETFD - set the close-on-exec flag of a file handle.
- *
- * - FD_CLOEXEC - the value of the close-on-exec flag.
- *
- * - F_GETFL - get file descriptor flags.
- *
- * - F_SETFL - set file descriptor flags.
- *
- * - O_APPEND, O_NONBLOCK, etc (see below) - file descriptor flag
- *   values for the above.
- *
- * - F_GETLK - determine whether a given region of a file is locked.
- *
- * - F_SETLK - acquire a lock on a region of a file.
- *
- * - F_SETLKW - acquire a lock on a region of a file, waiting if necessary.
- *
- * - F_RDLCK, F_WRLCK, F_UNLCK - types of lock for the above.
- *
- * The constants supported by Ruby for use with IO::sysopen are:
- *
- * - O_APPEND - open file in append mode.
- *
- * - O_NOCTTY - open tty without it becoming controlling tty.
- *
- * - O_CREAT - create file if it doesn't exist.
- *
- * - O_EXCL - used with O_CREAT, fail if file exists.
- *
- * - O_TRUNC - truncate file on open.
- *
- * - O_NONBLOCK / O_NDELAY - open in non-blocking mode.
- *
- * - O_RDONLY - open read-only.
- *
- * - O_WRONLY - open write-only.
- *
- * - O_RDWR - open read-write.
- *
- * - O_ACCMODE - mask to extract read/write flags.
- *
- * Example:
- * 
- *   require 'fcntl'
- *
- *   fd = IO::sysopen('/tmp/tempfile', 
- *        Fcntl::O_WRONLY | Fcntl::O_EXCL | Fcntl::O_CREAT)
- *   f = IO.open(fd)
- *   f.syswrite("TEMP DATA")
- *   f.close
- *
- */
 void
 Init_fcntl()
 {
diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c
index 691d512460..799445a89c 100644
--- a/ext/gdbm/gdbm.c
+++ b/ext/gdbm/gdbm.c
@@ -2,8 +2,8 @@
 
   gdbm.c -
 
-  $Author: usa $
-  $Date: 2005/06/20 07:53:20 $
+  $Author$
+  $Date$
   modified at: Mon Jan 24 15:59:52 JST 1994
 
 ************************************************/
@@ -44,11 +44,6 @@ closed_dbm()
     if (dbmp->di_dbm == 0) closed_dbm();\
 } while (0)
 
-#define GetDBM2(obj, data, dbm) {\
-    GetDBM(obj, data);\
-    (dbm) = dbmp->di_dbm;\
-}
-
 static void
 free_dbm(dbmp)
     struct dbmdata *dbmp;
@@ -72,21 +67,6 @@ fgdbm_close(obj)
     return Qnil;
 }
 
-static VALUE
-fgdbm_closed(obj)
-    VALUE obj;
-{
-    struct dbmdata *dbmp;
-
-    Data_Get_Struct(obj, struct dbmdata, dbmp);
-    if (dbmp == 0)
-	return Qtrue;
-    if (dbmp->di_dbm == 0)
-	return Qtrue;
-
-    return Qfalse;
-}
-
 static VALUE fgdbm_s_alloc _((VALUE));
 
 static VALUE
@@ -222,7 +202,8 @@ rb_gdbm_fetch3(obj, keystr)
     struct dbmdata *dbmp;
     GDBM_FILE dbm;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     return rb_gdbm_fetch2(dbm, keystr);
 }
 
@@ -318,7 +299,8 @@ fgdbm_index(obj, valstr)
     VALUE keystr, valstr2;
 
     StringValue(valstr);
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 
@@ -367,16 +349,15 @@ fgdbm_select(argc, argv, obj)
 	if (argc > 0) {
 	    rb_raise(rb_eArgError, "wrong number arguments(%d for 0)", argc);
 	}
-        GetDBM2(obj, dbmp, dbm);
+        GetDBM(obj, dbmp);
+        dbm = dbmp->di_dbm;
+
         for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
              keystr = rb_gdbm_nextkey(dbm, keystr)) {
             VALUE assoc = rb_assoc_new(keystr, rb_gdbm_fetch2(dbm, keystr));
-	    VALUE v = rb_yield(assoc);
 
-	    if (RTEST(v)) {
-		rb_ary_push(new, assoc);
-	    }
-	    GetDBM2(obj, dbmp, dbm);
+            if (RTEST(rb_yield(assoc)))
+                rb_ary_push(new, assoc);
         }
     }
     else {
@@ -427,7 +408,9 @@ rb_gdbm_delete(obj, keystr)
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     if (!gdbm_exists(dbm, key)) {
 	return Qnil;
     }
@@ -462,7 +445,9 @@ fgdbm_shift(obj)
     VALUE keystr, valstr;
 
     rb_gdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     keystr = rb_gdbm_firstkey(dbm);
     if (NIL_P(keystr)) return Qnil;
     valstr = rb_gdbm_fetch2(dbm, keystr);
@@ -482,7 +467,8 @@ fgdbm_delete_if(obj)
     int i, status = 0, n;
 
     rb_gdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     n = dbmp->di_size;
     dbmp->di_size = -1;
 
@@ -493,7 +479,6 @@ fgdbm_delete_if(obj)
         ret = rb_protect(rb_yield, rb_assoc_new(keystr, valstr), &status);
         if (status != 0) break;
 	if (RTEST(ret)) rb_ary_push(ary, keystr);
-	GetDBM2(obj, dbmp, dbm);
     }
 
     for (i = 0; i < RARRAY(ary)->len; i++)
@@ -513,7 +498,8 @@ fgdbm_clear(obj)
     GDBM_FILE dbm;
 
     rb_gdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     dbmp->di_size = -1;
 
 #if 0
@@ -551,7 +537,8 @@ fgdbm_invert(obj)
     VALUE keystr, valstr;
     VALUE hash = rb_hash_new();
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 	valstr = rb_gdbm_fetch2(dbm, keystr);
@@ -611,16 +598,16 @@ fgdbm_store(obj, keystr, valstr)
 
     rb_gdbm_modify(obj);
     StringValue(keystr);
-    StringValue(valstr);
-
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
+    StringValue(valstr);
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
     dbmp->di_size = -1;
+    dbm = dbmp->di_dbm;
     if (gdbm_store(dbm, key, val, GDBM_REPLACE)) {
 	if (errno == EPERM) rb_sys_fail(0);
 	rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
@@ -638,8 +625,9 @@ fgdbm_length(obj)
     GDBM_FILE dbm;
     int i = 0;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
     if (dbmp->di_size > 0) return INT2FIX(dbmp->di_size);
+    dbm = dbmp->di_dbm;
 
     for (key = gdbm_firstkey(dbm); key.dptr; key = nextkey) {
         nextkey = gdbm_nextkey(dbm, key);
@@ -683,12 +671,13 @@ fgdbm_each_value(obj)
     GDBM_FILE dbm;
     VALUE keystr;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 
         rb_yield(rb_gdbm_fetch2(dbm, keystr));
-	GetDBM2(obj, dbmp, dbm);
     }
     return obj;
 }
@@ -701,12 +690,13 @@ fgdbm_each_key(obj)
     GDBM_FILE dbm;
     VALUE keystr;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 
         rb_yield(keystr);
-	GetDBM2(obj, dbmp, dbm);
     }
     return obj;
 }
@@ -719,12 +709,13 @@ fgdbm_each_pair(obj)
     struct dbmdata *dbmp;
     VALUE keystr;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 
         rb_yield(rb_assoc_new(keystr, rb_gdbm_fetch2(dbm, keystr)));
-	GetDBM2(obj, dbmp, dbm);
     }
 
     return obj;
@@ -738,7 +729,9 @@ fgdbm_keys(obj)
     GDBM_FILE dbm;
     VALUE keystr, ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     ary = rb_ary_new();
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
@@ -758,7 +751,9 @@ fgdbm_values(obj)
     GDBM_FILE dbm;
     VALUE valstr, ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     ary = rb_ary_new();
     for (key = gdbm_firstkey(dbm); key.dptr; key = nextkey) {
         nextkey = gdbm_nextkey(dbm, key);
@@ -782,7 +777,8 @@ fgdbm_has_key(obj, keystr)
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     if (gdbm_exists(dbm, key))
         return Qtrue;
     return Qfalse;
@@ -797,7 +793,8 @@ fgdbm_has_value(obj, valstr)
     VALUE keystr, valstr2;
 
     StringValue(valstr);
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
 
@@ -821,7 +818,9 @@ fgdbm_to_a(obj)
     GDBM_FILE dbm;
     VALUE keystr, ary;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     ary = rb_ary_new();
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
@@ -840,7 +839,8 @@ fgdbm_reorganize(obj)
     GDBM_FILE dbm;
 
     rb_gdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     gdbm_reorganize(dbm);
     return obj;
 }
@@ -853,7 +853,8 @@ fgdbm_sync(obj)
     GDBM_FILE dbm;
 
     rb_gdbm_modify(obj);
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
     gdbm_sync(dbm);
     return obj;
 }
@@ -866,7 +867,9 @@ fgdbm_set_cachesize(obj, val)
     GDBM_FILE dbm;
     int optval;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     optval = FIX2INT(val);
     if (gdbm_setopt(dbm, GDBM_CACHESIZE, &optval, sizeof(optval)) == -1) {
 	rb_raise(rb_eGDBMError, "%s", gdbm_strerror(gdbm_errno));
@@ -882,7 +885,9 @@ fgdbm_set_fastmode(obj, val)
     GDBM_FILE dbm;
     int optval;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     optval = 0;
     if (RTEST(val))
         optval = 1;
@@ -905,7 +910,9 @@ fgdbm_set_syncmode(obj, val)
     GDBM_FILE dbm;
     int optval;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     optval = 0;
     if (RTEST(val))
         optval = 1;
@@ -925,7 +932,9 @@ fgdbm_to_hash(obj)
     GDBM_FILE dbm;
     VALUE keystr, hash;
 
-    GetDBM2(obj, dbmp, dbm);
+    GetDBM(obj, dbmp);
+    dbm = dbmp->di_dbm;
+
     hash = rb_hash_new();
     for (keystr = rb_gdbm_firstkey(dbm); RTEST(keystr);
          keystr = rb_gdbm_nextkey(dbm, keystr)) {
@@ -956,7 +965,6 @@ Init_gdbm()
 
     rb_define_method(rb_cGDBM, "initialize", fgdbm_initialize, -1);
     rb_define_method(rb_cGDBM, "close", fgdbm_close, 0);
-    rb_define_method(rb_cGDBM, "closed?", fgdbm_closed, 0);
     rb_define_method(rb_cGDBM, "[]", fgdbm_aref, 1);
     rb_define_method(rb_cGDBM, "fetch", fgdbm_fetch_m, -1);
     rb_define_method(rb_cGDBM, "[]=", fgdbm_store, 2);
diff --git a/ext/gdbm/testgdbm.rb b/ext/gdbm/testgdbm.rb
new file mode 100644
index 0000000000..a435498640
--- /dev/null
+++ b/ext/gdbm/testgdbm.rb
@@ -0,0 +1,663 @@
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+
+if $".grep(/\bgdbm.so\b/).empty?
+  begin
+    require './gdbm'
+  rescue LoadError
+    require 'gdbm'
+  end
+end
+
+def uname_s
+  require 'rbconfig'
+  case Config::CONFIG['host_os']
+  when 'cygwin'
+    require 'Win32API'
+    uname = Win32API.new('cygwin1', 'uname', 'P', 'I')
+    utsname = ' ' * 100
+    raise 'cannot get system name' if uname.call(utsname) == -1
+
+    utsname.unpack('A20' * 5)[0]
+  else
+    Config::CONFIG['host_os']
+  end
+end
+
+SYSTEM = uname_s
+
+class TestGDBM < RUNIT::TestCase
+  def setup
+    @path = "tmptest_gdbm_"
+    assert_instance_of(GDBM, @gdbm = GDBM.new(@path))
+
+    # prepare to make readonly GDBM file
+    GDBM.open("tmptest_gdbm_rdonly", 0400) {|gdbm|
+      gdbm['foo'] = 'FOO'
+    }
+    assert_instance_of(GDBM, @gdbm_rdonly = GDBM.new("tmptest_gdbm_rdonly", nil))
+  end
+  def teardown
+    assert_nil(@gdbm.close)
+    assert_nil(@gdbm_rdonly.close)
+    GC.start
+    File.delete *Dir.glob("tmptest_gdbm*").to_a
+    p Dir.glob("tmptest_gdbm*") if $DEBUG
+  end
+
+  def check_size(expect, gdbm=@gdbm)
+    assert_equals(expect, gdbm.size)
+    n = 0
+    gdbm.each { n+=1 }
+    assert_equals(expect, n)
+    if expect == 0
+      assert_equals(true, gdbm.empty?)
+    else
+      assert_equals(false, gdbm.empty?)
+    end
+  end
+
+  def test_version
+    STDERR.print GDBM::VERSION
+  end
+
+  def test_s_new_has_no_block
+    # GDBM.new ignore the block
+    foo = true
+    assert_instance_of(GDBM, gdbm = GDBM.new("tmptest_gdbm") { foo = false })
+    assert_equals(foo, true)
+    assert_nil(gdbm.close)
+  end
+  def test_s_open_create_new
+    return if /^CYGWIN_9/ =~ SYSTEM
+
+    save_mask = File.umask(0)
+    begin
+      assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm"))
+      gdbm.close
+      assert_equals(File.stat("tmptest_gdbm").mode & 0777, 0666)
+      assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm2", 0644))
+      gdbm.close
+      assert_equals(File.stat("tmptest_gdbm2").mode & 0777, 0644)
+    ensure
+      File.umask save_mask
+    end
+  end
+  def test_s_open_no_create
+    # this test is failed on libgdbm 1.8.0
+    assert_nil(gdbm = GDBM.open("tmptest_gdbm", nil))
+  ensure
+    gdbm.close if gdbm
+  end
+  def test_s_open_3rd_arg
+    assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm", 0644,
+					      GDBM::FAST))
+    gdbm.close
+
+    # gdbm 1.8.0 specific
+    if defined? GDBM::SYNC
+      assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm", 0644,
+						GDBM::SYNC))
+      gdbm.close
+    end
+    # gdbm 1.8.0 specific
+    if defined? GDBM::NOLOCK
+      assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm", 0644,
+						GDBM::NOLOCK))
+      gdbm.close
+    end
+  end
+  def test_s_open_with_block
+    assert_equals(GDBM.open("tmptest_gdbm") { :foo }, :foo)
+  end
+  def test_s_open_lock
+    fork() {
+      assert_instance_of(GDBM, gdbm  = GDBM.open("tmptest_gdbm", 0644))
+      sleep 2
+    }
+    begin
+      sleep 1
+      assert_exception(Errno::EWOULDBLOCK) {
+	begin
+	  assert_instance_of(GDBM, gdbm2 = GDBM.open("tmptest_gdbm", 0644))
+	rescue Errno::EAGAIN, Errno::EACCES
+	  raise Errno::EWOULDBLOCK
+	end
+      }
+    ensure
+      Process.wait
+    end
+  end
+
+=begin
+  # Is it guaranteed on many OS?
+  def test_s_open_lock_one_process
+    # locking on one process
+    assert_instance_of(GDBM, gdbm  = GDBM.open("tmptest_gdbm", 0644))
+    assert_exception(Errno::EWOULDBLOCK) {
+      begin
+	GDBM.open("tmptest_gdbm", 0644)
+      rescue Errno::EAGAIN
+	raise Errno::EWOULDBLOCK
+      end
+    }
+  end
+=end
+
+  def test_s_open_nolock
+    # gdbm 1.8.0 specific
+    if not defined? GDBM::NOLOCK
+      return
+    end
+
+    fork() {
+      assert_instance_of(GDBM, gdbm  = GDBM.open("tmptest_gdbm", 0644,
+						GDBM::NOLOCK))
+      sleep 2
+    }
+    sleep 1
+    begin
+      gdbm2 = nil
+      assert_no_exception(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
+	assert_instance_of(GDBM, gdbm2 = GDBM.open("tmptest_gdbm", 0644))
+      }
+    ensure
+      Process.wait
+      gdbm2.close if gdbm2
+    end
+
+    p Dir.glob("tmptest_gdbm*") if $DEBUG
+
+    fork() {
+      assert_instance_of(GDBM, gdbm  = GDBM.open("tmptest_gdbm", 0644))
+      sleep 2
+    }
+    begin
+      sleep 1
+      gdbm2 = nil
+      assert_no_exception(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
+	# this test is failed on Cygwin98 (???)
+	assert_instance_of(GDBM, gdbm2 = GDBM.open("tmptest_gdbm", 0644,
+						   GDBM::NOLOCK))
+      }
+    ensure
+      Process.wait
+      gdbm2.close if gdbm2
+    end
+  end
+
+  def test_s_open_error
+    assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm", 0))
+    assert_exception(Errno::EACCES) {
+      GDBM.open("tmptest_gdbm", 0)
+    }
+    gdbm.close
+  end
+
+  def test_close
+    assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm"))
+    assert_nil(gdbm.close)
+
+    # closed GDBM file
+    assert_exception(RuntimeError) { gdbm.close }
+  end
+
+  def test_aref
+    assert_equals('bar', @gdbm['foo'] = 'bar')
+    assert_equals('bar', @gdbm['foo'])
+
+    assert_nil(@gdbm['bar'])
+  end
+
+  def test_fetch
+    assert_equals('bar', @gdbm['foo']='bar')
+    assert_equals('bar', @gdbm.fetch('foo'))
+
+    # key not found
+    assert_exception(IndexError) {
+      @gdbm.fetch('bar')
+    }
+
+    # test for `ifnone' arg
+    assert_equals('baz', @gdbm.fetch('bar', 'baz'))
+
+    # test for `ifnone' block
+    assert_equals('foobar', @gdbm.fetch('bar') {|key| 'foo' + key })
+  end
+
+  def test_aset
+    num = 0
+    2.times {|i|
+      assert_equals('foo', @gdbm['foo'] = 'foo')
+      assert_equals('foo', @gdbm['foo'])
+      assert_equals('bar', @gdbm['foo'] = 'bar')
+      assert_equals('bar', @gdbm['foo'])
+
+      num += 1 if i == 0
+      assert_equals(num, @gdbm.size)
+
+      # assign nil
+      assert_equals('', @gdbm['bar'] = '')
+      assert_equals('', @gdbm['bar'])
+
+      num += 1 if i == 0
+      assert_equals(num, @gdbm.size)
+
+      # empty string
+      assert_equals('', @gdbm[''] = '')
+      assert_equals('', @gdbm[''])
+
+      num += 1 if i == 0
+      assert_equals(num, @gdbm.size)
+
+      # Fixnum
+      assert_equals('200', @gdbm['100'] = '200')
+      assert_equals('200', @gdbm['100'])
+
+      num += 1 if i == 0
+      assert_equals(num, @gdbm.size)
+
+      # Big key and value
+      assert_equals('y' * 100, @gdbm['x' * 100] = 'y' * 100)
+      assert_equals('y' * 100, @gdbm['x' * 100])
+
+      num += 1 if i == 0
+      assert_equals(num, @gdbm.size)
+    }
+  end
+
+  def test_index
+    assert_equals('bar', @gdbm['foo'] = 'bar')
+    assert_equals('foo', @gdbm.index('bar'))
+    assert_nil(@gdbm['bar'])
+  end
+
+  def test_indexes
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+    assert_equals(values.reverse, @gdbm.indexes(*keys.reverse))
+  end
+
+  def test_values_at
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+    assert_equals(values.reverse, @gdbm.values_at(*keys.reverse))
+  end
+
+  def test_select_with_block
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+    ret = @gdbm.select {|k,v|
+      assert_equals(k.upcase, v)
+      k != "bar"
+    }
+    assert_equals([['baz', 'BAZ'], ['foo', 'FOO']],
+		  ret.sort)
+  end
+
+  def test_length
+    num = 10
+    assert_equals(0, @gdbm.size)
+    num.times {|i|
+      i = i.to_s
+      @gdbm[i] = i
+    }
+    assert_equals(num, @gdbm.size)
+
+    @gdbm.shift
+
+    assert_equals(num - 1, @gdbm.size)
+  end
+
+  def test_empty?
+    assert_equals(true, @gdbm.empty?)
+    @gdbm['foo'] = 'FOO'
+    assert_equals(false, @gdbm.empty?)
+  end
+
+  def test_each_pair
+    n = 0
+    @gdbm.each_pair { n += 1 }
+    assert_equals(0, n)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+
+    n = 0
+    ret = @gdbm.each_pair {|key, val|
+      assert_not_nil(i = keys.index(key))
+      assert_equals(val, values[i])
+
+      n += 1
+    }
+    assert_equals(keys.size, n)
+    assert_equals(@gdbm, ret)
+  end
+
+  def test_each_value
+    n = 0
+    @gdbm.each_value { n += 1 }
+    assert_equals(0, n)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+
+    n = 0
+    ret = @gdbm.each_value {|val|
+      assert_not_nil(key = @gdbm.index(val))
+      assert_not_nil(i = keys.index(key))
+      assert_equals(val, values[i])
+
+      n += 1
+    }
+    assert_equals(keys.size, n)
+    assert_equals(@gdbm, ret)
+  end
+
+  def test_each_key
+    n = 0
+    @gdbm.each_key { n += 1 }
+    assert_equals(0, n)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+
+    n = 0
+    ret = @gdbm.each_key {|key|
+      assert_not_nil(i = keys.index(key))
+      assert_equals(@gdbm[key], values[i])
+
+      n += 1
+    }
+    assert_equals(keys.size, n)
+    assert_equals(@gdbm, ret)
+  end
+
+  def test_keys
+    assert_equals([], @gdbm.keys)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+
+    assert_equals(keys.sort, @gdbm.keys.sort)
+    assert_equals(values.sort, @gdbm.values.sort)
+  end
+
+  def test_values
+    test_keys
+  end
+
+  def test_shift
+    assert_nil(@gdbm.shift)
+    assert_equals(0, @gdbm.size)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+
+    ret_keys = []
+    ret_values = []
+    while ret = @gdbm.shift
+      ret_keys.push ret[0]
+      ret_values.push ret[1]
+
+      assert_equals(keys.size - ret_keys.size, @gdbm.size)
+    end
+
+    assert_equals(keys.sort, ret_keys.sort)
+    assert_equals(values.sort, ret_values.sort)
+  end
+
+  def test_delete
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+    key = keys[1]
+
+    assert_nil(@gdbm.delete(key))
+    assert_equals(0, @gdbm.size)
+
+    @gdbm[keys[0]], @gdbm[keys[1]], @gdbm[keys[2]] = values
+
+    assert_equals('BAR', @gdbm.delete(key))
+    assert_nil(@gdbm[key])
+    assert_equals(2, @gdbm.size)
+
+    assert_nil(@gdbm.delete(key))
+
+    if /^CYGWIN_9/ !~ SYSTEM
+      assert_exception(GDBMError) {
+	@gdbm_rdonly.delete("foo")
+      }
+
+      assert_nil(@gdbm_rdonly.delete("bar"))
+    end
+  end
+  def test_delete_with_block
+    key = 'no called block'
+    @gdbm[key] = 'foo'
+    assert_equals('foo', @gdbm.delete(key) {|k| k.replace 'called block'})
+    assert_equals('no called block', key)
+    assert_equals(0, @gdbm.size)
+
+    key = 'no called block'
+    assert_equals(:blockval,
+		  @gdbm.delete(key) {|k| k.replace 'called block'; :blockval})
+    assert_equals('called block', key)
+    assert_equals(0, @gdbm.size)
+  end
+
+  def test_delete_if
+    v = "0"
+    100.times {@gdbm[v] = v; v = v.next}
+
+    ret = @gdbm.delete_if {|key, val| key.to_i < 50}
+    assert_equals(@gdbm, ret)
+    check_size(50, @gdbm)
+
+    ret = @gdbm.delete_if {|key, val| key.to_i >= 50}
+    assert_equals(@gdbm, ret)
+    check_size(0, @gdbm)
+
+    # break
+    v = "0"
+    100.times {@gdbm[v] = v; v = v.next}
+    check_size(100, @gdbm)
+    n = 0;
+    @gdbm.delete_if {|key, val|
+      break if n > 50
+      n+=1
+      true
+    }
+    assert_equals(51, n)
+    check_size(49, @gdbm)
+
+    @gdbm.clear
+
+    # raise
+    v = "0"
+    100.times {@gdbm[v] = v; v = v.next}
+    check_size(100, @gdbm)
+    n = 0;
+    begin
+      @gdbm.delete_if {|key, val|
+	raise "runtime error" if n > 50
+	n+=1
+	true
+      }
+    rescue
+    end
+    assert_equals(51, n)
+    check_size(49, @gdbm)
+  end
+
+  def test_reject
+    v = "0"
+    100.times {@gdbm[v] = v; v = v.next}
+
+    hash = @gdbm.reject {|key, val| key.to_i < 50}
+    assert_instance_of(Hash, hash)
+    assert_equals(100, @gdbm.size)
+
+    assert_equals(50, hash.size)
+    hash.each_pair {|key,val|
+      assert_equals(false, key.to_i < 50)
+      assert_equals(key, val)
+    }
+
+    hash = @gdbm.reject {|key, val| key.to_i < 100}
+    assert_instance_of(Hash, hash)
+    assert_equals(true, hash.empty?)
+  end
+
+  def test_clear
+    v = "1"
+    100.times {v = v.next; @gdbm[v] = v}
+
+    assert_equals(@gdbm, @gdbm.clear)
+
+    # validate GDBM#size
+    i = 0
+    @gdbm.each { i += 1 }
+    assert_equals(@gdbm.size, i)
+    assert_equals(0, i)
+  end
+
+  def test_invert
+    v = "0"
+    100.times {@gdbm[v] = v; v = v.next}
+
+    hash = @gdbm.invert
+    assert_instance_of(Hash, hash)
+    assert_equals(100, hash.size)
+    hash.each_pair {|key, val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+
+  def test_update
+    hash = {}
+    v = "0"
+    100.times {v = v.next; hash[v] = v}
+
+    @gdbm["101"] = "101"
+    @gdbm.update hash
+    assert_equals(101, @gdbm.size)
+    @gdbm.each_pair {|key, val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+
+  def test_replace
+    hash = {}
+    v = "0"
+    100.times {v = v.next; hash[v] = v}
+
+    @gdbm["101"] = "101"
+    @gdbm.replace hash
+    assert_equals(100, @gdbm.size)
+    @gdbm.each_pair {|key, val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+
+  def test_reorganize
+    size1 = File.size(@path)
+    i = "1"
+    1000.times {i = i.next; @gdbm[i] = i}
+    @gdbm.clear
+    @gdbm.sync
+
+    size2 = File.size(@path)
+    @gdbm.reorganize
+    size3 = File.size(@path)
+
+    # p [size1, size2, size3]
+    assert_equals(true, size1 < size2)
+    # this test is failed on Cygwin98. `GDBM version 1.8.0, as of May 19, 1999'
+    assert_equals(true, size3 < size2)
+    assert_equals(size1, size3)
+  end
+
+  def test_sync
+    assert_instance_of(GDBM, gdbm = GDBM.open('tmptest_gdbm', 0666, GDBM::FAST))
+    assert_equals(gdbm.sync, gdbm)
+    gdbm.close
+    assert_instance_of(GDBM, gdbm = GDBM.open('tmptest_gdbm', 0666))
+    assert_equals(gdbm.sync, gdbm)
+    gdbm.close
+  end
+
+  def test_cachesize=
+      assert_equals(@gdbm.cachesize = 1024, 1024)
+  end
+
+  def test_fastmode=
+      assert_equals(@gdbm.fastmode = true, true)
+  end
+
+  def test_syncmode=
+      assert_equals(@gdbm.syncmode = true, true)
+  end
+
+  def test_haskey?
+    assert_equals('bar', @gdbm['foo']='bar')
+    assert_equals(true,  @gdbm.has_key?('foo'))
+    assert_equals(false, @gdbm.has_key?('bar'))
+  end
+
+  def test_has_value?
+    assert_equals('bar', @gdbm['foo']='bar')
+    assert_equals(true,  @gdbm.has_value?('bar'))
+    assert_equals(false, @gdbm.has_value?('foo'))
+  end
+
+  def test_to_a
+    v = "0"
+    100.times {v = v.next; @gdbm[v] = v}
+
+    ary = @gdbm.to_a
+    assert_instance_of(Array, ary)
+    assert_equals(100, ary.size)
+    ary.each {|key,val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+
+  def test_to_hash
+    v = "0"
+    100.times {v = v.next; @gdbm[v] = v}
+
+    hash = @gdbm.to_hash
+    assert_instance_of(Hash, hash)
+    assert_equals(100, hash.size)
+    hash.each {|key,val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+end
+
+if $0 == __FILE__
+  if ARGV.size == 0
+    suite = RUNIT::TestSuite.new
+    suite.add_test(TestGDBM.suite)
+  else
+    suite = RUNIT::TestSuite.new
+    ARGV.each do |testmethod|
+      suite.add_test(TestGDBM.new(testmethod))
+    end
+  end
+
+  RUNIT::CUI::TestRunner.run(suite)
+end
diff --git a/ext/iconv/charset_alias.rb b/ext/iconv/charset_alias.rb
index aed4644290..65fd41759b 100644
--- a/ext/iconv/charset_alias.rb
+++ b/ext/iconv/charset_alias.rb
@@ -1,12 +1,11 @@
 #! /usr/bin/ruby
 # :stopdoc:
 require 'rbconfig'
-require 'optparse'
 
 # http://www.ctan.org/tex-archive/macros/texinfo/texinfo/intl/config.charset
 # Fri, 30 May 2003 00:09:00 GMT'
 
-OS = Config::CONFIG["target_os"]
+OS = Config::CONFIG["target"]
 SHELL = Config::CONFIG['SHELL']
 
 class Hash::Ordered < Hash
@@ -15,89 +14,39 @@ class Hash::Ordered < Hash
   end
   def []=(key, val)
     ary = fetch(key) {return super(key, [self.size, key, val])} and
-      ary << val
+      ary.last = val
   end
-  def sort
-    values.sort.collect {|i, *rest| rest}
-  end
-  def each(&block)
-    sort.each(&block)
+  def each
+    values.sort.each {|i, key, val| yield key, val}
   end
 end
 
 def charset_alias(config_charset, mapfile, target = OS)
   map = Hash::Ordered.new
   comments = []
-  open(config_charset) do |input|
-    input.find {|line| /^case "\$os" in/ =~ line} or break
-    input.find {|line|
-      /^\s*([-\w\*]+(?:\s*\|\s*[-\w\*]+)*)(?=\))/ =~ line and
-      $&.split('|').any? {|pattern| File.fnmatch?(pattern.strip, target)}
-    } or break
-    input.find do |line|
-      case line
-      when /^\s*echo "(?:\$\w+\.)?([-\w*]+)\s+([-\w]+)"/
-        sys, can = $1, $2
-        can.downcase!
-        map[can] = sys
-        false
-      when /^\s*;;/
-        true
-      else
-        false
-      end
-    end
+  IO.foreach("|#{SHELL} #{config_charset} #{target}") do |list|
+    next comments << list if /^\#/ =~ list
+    next unless /^(\S+)\s+(\S+)$/ =~ list
+    sys, can = $1, $2
+    can.downcase!
+    map[can] = sys
   end
   case target
   when /linux|-gnu/
-    # map.delete('ascii')
-  when /cygwin|os2-emx/
+    map.delete('ascii')
+  when /cygwin/
     # get rid of tilde/yen problem.
     map['shift_jis'] = 'cp932'
   end
-  st = Hash.new(0)
-  map = map.sort.collect do |can, *sys|
-    if sys.grep(/^en_us(?=.|$)/i) {break true} == true
-      noen = %r"^(?!en_us)\w+_\w+#{Regexp.new($')}$"i #"
-      sys.reject! {|s| noen =~ s}
-    end
-    sys = sys.first
-    st[sys] += 1
-    [can, sys]
-  end
-  st.delete_if {|sys, i| i == 1}.empty?
-  st.keys.each {|sys| st[sys] = nil}
-  st.default = nil
-  writer = proc do |f|
+  open(mapfile, "w") do |f|
     f.puts("require 'iconv.so'")
     f.puts
     f.puts(comments)
     f.puts("class Iconv")
-    i = 0
-    map.each do |can, sys|
-      if s = st[sys]
-        sys = s
-      elsif st.key?(sys)
-        sys = (st[sys] = "sys#{i+=1}") + " = '#{sys}'.freeze"
-      else
-        sys = "'#{sys}'.freeze"
-      end
-      f.puts("  charset_map['#{can}'] = #{sys}")
-    end
+    map.each {|can, sys| f.puts("  charset_map['#{can}'.freeze] = '#{sys}'.freeze")}
     f.puts("end")
   end
-  if mapfile
-    open(mapfile, "w", &writer)
-  else
-    writer[STDOUT]
-  end
 end
 
-target = OS
-opt = nil
-ARGV.options do |opt|
-  opt.banner << " config.status map.rb"
-  opt.on("--target OS") {|t| target = t}
-  opt.parse! and (1..2) === ARGV.size
-end or abort opt.to_s
-charset_alias(ARGV[0], ARGV[1], target)
+(2..3) === ARGV.size or abort "usage: #$0 config.status map.rb [target]"
+charset_alias(*ARGV)
diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb
index a9d0cfb5e6..65ea327950 100644
--- a/ext/iconv/extconf.rb
+++ b/ext/iconv/extconf.rb
@@ -6,7 +6,7 @@ conf = File.exist?(File.join($srcdir, "config.charset"))
 conf = with_config("config-charset", enable_config("config-charset", conf))
 
 if have_func("iconv", "iconv.h") or
-    have_library("iconv", "iconv", "iconv.h")
+    have_library("iconv", "iconv") {|s| s.sub(/(?=\n\/\*top\*\/)/, "#include <iconv.h>")}
   if checking_for("const of iconv() 2nd argument") do
       create_tmpsrc(cpp_include("iconv.h") + "---> iconv(cd,0,0,0,0) <---")
       src = xpopen(cpp_command("")) {|f|f.read}
@@ -21,22 +21,20 @@ if have_func("iconv", "iconv.h") or
         /\bconst\b/ =~ second
       end
     end
-    $defs.push('-DICONV_INPTR_CONST')
+    $defs.push('-DICONV_INPTR_CAST=""')
+  else
+    $defs.push('-DICONV_INPTR_CAST="(char **)"')
   end
   if conf
     prefix = '$(srcdir)'
     prefix =  $nmake ? "{#{prefix}}" : "#{prefix}/"
-    if $extout
-      wrapper = "$(RUBYARCHDIR)/iconv.rb"
-    else
-      wrapper = "./iconv.rb"
-      $INSTALLFILES = [[wrapper, "$(RUBYARCHDIR)"]]
-    end
+    wrapper = "./iconv.rb"
+    $INSTALLFILES = [[wrapper, "$(RUBYARCHDIR)"]]
     if String === conf
       require 'uri'
       scheme = URI.parse(conf).scheme
     else
-      conf = "$(srcdir)/config.charset"
+      conf = prefix + "config.charset"
     end
     $cleanfiles << wrapper
   end
@@ -45,7 +43,7 @@ if have_func("iconv", "iconv.h") or
     open("Makefile", "a") do |mf|
       mf.print("\nall: #{wrapper}\n\n#{wrapper}: #{prefix}charset_alias.rb")
       mf.print(" ", conf) unless scheme
-      mf.print("\n\t$(RUBY) $(srcdir)/charset_alias.rb #{conf} $@\n")
+      mf.print("\n\t$(RUBY) ", prefix, "charset_alias.rb ", conf, " $@\n")
     end
   end
 end
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 918dd51630..29ab2c7d7b 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -3,8 +3,8 @@
 
   iconv.c -
 
-  $Author: matz $
-  $Date: 2005/12/12 00:36:51 $
+  $Author$
+  $Date$
   created at: Wed Dec  1 20:28:09 JST 1999
 
   All the files in this distribution are covered under the Ruby's
@@ -83,12 +83,10 @@ struct iconv_env_t
     VALUE (*append)_((VALUE, VALUE));
 };
 
-static VALUE rb_eIconvInvalidEncoding;
 static VALUE rb_eIconvFailure;
 static VALUE rb_eIconvIllegalSeq;
 static VALUE rb_eIconvInvalidChar;
 static VALUE rb_eIconvOutOfRange;
-static VALUE rb_eIconvBrokenLibrary;
 
 static ID rb_success, rb_failed;
 static VALUE iconv_fail _((VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, const char *mesg));
@@ -113,12 +111,6 @@ static VALUE iconv_iconv _((int argc, VALUE *argv, VALUE self));
 
 static VALUE charset_map;
 
-/*
- * Document-method: charset_map
- * call-seq: Iconv.charset_map
- *
- * Returns the map from canonical name to system dependent name.
- */
 static VALUE charset_map_get _((void))
 {
     return charset_map;
@@ -169,18 +161,10 @@ iconv_create
 	    cd = iconv_open(tocode, fromcode);
 	}
 	if (cd == (iconv_t)-1) {
-	    int inval = errno == EINVAL;
-	    char *s = inval ? "invalid encoding " : "iconv";
-	    volatile VALUE msg = rb_str_new(0, strlen(s) + RSTRING(to)->len +
-					    RSTRING(from)->len + 8);
-
-	    sprintf(RSTRING(msg)->ptr, "%s(\"%s\", \"%s\")",
-		    s, RSTRING(to)->ptr, RSTRING(from)->ptr);
-	    s = RSTRING(msg)->ptr;
-	    RSTRING(msg)->len = strlen(s);
-	    if (!inval) rb_sys_fail(s);
-	    iconv_fail(rb_eIconvInvalidEncoding,
-		       Qnil, rb_ary_new3(2, to, from), NULL, s);
+	    volatile VALUE msg = rb_str_new2("iconv(\"");
+	    rb_str_buf_cat2(rb_str_buf_append(msg, to), "\", \"");
+	    rb_str_buf_cat2(rb_str_buf_append(msg, from), "\")");
+	    rb_sys_fail(StringValuePtr(msg));
 	}
     }
 
@@ -244,15 +228,7 @@ iconv_try
     size_t *outlen;
 #endif /* HAVE_PROTOTYPES */
 {
-#ifdef ICONV_INPTR_CONST
-#define ICONV_INPTR_CAST
-#else
-#define ICONV_INPTR_CAST (char **)
-#endif
-    size_t ret;
-
-    errno = 0;
-    ret = iconv(cd, ICONV_INPTR_CAST inptr, inlen, outptr, outlen);
+    size_t ret = iconv(cd, ICONV_INPTR_CAST inptr, inlen, outptr, outlen);
     if (ret == (size_t)-1) {
 	if (!*inlen)
 	    return Qfalse;
@@ -264,8 +240,6 @@ iconv_try
 	    return rb_eIconvIllegalSeq;
 	  case EINVAL:
 	    return rb_eIconvInvalidChar;
-	  case 0:
-	    return rb_eIconvBrokenLibrary;
 	  default:
 	    rb_sys_fail("iconv");
 	}
@@ -530,8 +504,8 @@ iconv_s_allocate
  * === Exceptions
  *
  * TypeError::       if +to+ or +from+ aren't String
- * InvalidEncoding:: if designated converter couldn't find out
- * SystemCallError:: if <tt>iconv_open(3)</tt> fails
+ * ArgumentError::   if designated converter couldn't find out
+ * SystemCallError:: if <tt>iconv_open3</tt> fails
  */
 static VALUE
 iconv_initialize
@@ -622,7 +596,7 @@ iconv_s_convert
  * === Exceptions
  *
  * Exceptions thrown by Iconv.new, Iconv.open and Iconv#iconv.
- */
+*/
 static VALUE
 iconv_s_iconv
 #ifdef HAVE_PROTOTYPES
@@ -651,9 +625,7 @@ iconv_s_iconv
  * Document-method: Iconv::conv
  * call-seq: Iconv.iconv(to, from, *strs)
  *
- * Shorthand for
- *   Iconv.iconv(to, from, str).join
- * See Iconv.iconv.
+ * See Iconv.iconv ???
  */
 static VALUE
 iconv_s_conv
@@ -683,8 +655,8 @@ iconv_s_conv
  * multiple calls of #close are guaranteed to end successfully.
  *
  * Returns a string containing the byte sequence to change the output buffer to
- * its initial shift state.
- */
+ * its initial shift state.  <i>???</i>
+*/
 static VALUE
 iconv_init_state
 #ifdef HAVE_PROTOTYPES
@@ -740,7 +712,7 @@ iconv_finish
  * === Examples
  *
  * See the Iconv documentation.
- */
+*/
 static VALUE
 iconv_iconv
 #ifdef HAVE_PROTOTYPES
@@ -760,7 +732,7 @@ iconv_iconv
 
     return iconv_convert(VALUE2ICONV(cd), str,
 			 NIL_P(n1) ? 0 : NUM2INT(n1),
-			 NIL_P(n2) ? -1 : NUM2INT(n2),
+			 NIL_P(n2) ? -1 : NUM2INT(n1),
 			 NULL);
 }
 
@@ -768,16 +740,22 @@ iconv_iconv
  * Document-class: Iconv::Failure
  *
  * Base attributes for Iconv exceptions.
- */
-
-/*
- * Document-method: success
- * call-seq: success
+ * 
+ * === Iconv::Failure#success
  *
  * Returns string(s) translated successfully until the exception occurred.
  * * In the case of failure occurred within Iconv.iconv, returned
  *   value is an array of strings translated successfully preceding
  *   failure and the last element is string on the way.
+ *
+ * === Iconv::Failure#failed
+ * 
+ * Returns substring of the original string passed to Iconv that starts at the
+ * character caused the exception. 
+ *
+ * === Iconv::Failure#inspect
+ *
+ * Returns inspected string like as: #<_class_: _success_, _failed_>
  */
 static VALUE
 iconv_failure_success
@@ -792,11 +770,7 @@ iconv_failure_success
 }
 
 /*
- * Document-method: failed
- * call-seq: failed
- *
- * Returns substring of the original string passed to Iconv that starts at the
- * character caused the exception. 
+ * Comment!
  */
 static VALUE
 iconv_failure_failed
@@ -810,12 +784,6 @@ iconv_failure_failed
     return rb_attr_get(self, rb_failed);
 }
 
-/*
- * Document-method: inspect
- * call-seq: inspect
- *
- * Returns inspected string like as: #<_class_: _success_, _failed_>
- */
 static VALUE
 iconv_failure_inspect
 #ifdef HAVE_PROTOTYPES
@@ -837,17 +805,19 @@ iconv_failure_inspect
 }
 
 /*
- * Document-class: Iconv::InvalidEncoding
- * 
- * Requested coding-system is not available on this system.
- */
-
-/*
  * Document-class: Iconv::IllegalSequence
  * 
  * Input conversion stopped due to an input byte that does not belong to
  * the input codeset, or the output codeset does not contain the
  * character.
+ * 
+ * === Superclass
+ * 
+ * ArgumentError
+ * 
+ * === Included Modules
+ * 
+ * Iconv::Failure
  */
 
 /*
@@ -855,19 +825,28 @@ iconv_failure_inspect
  * 
  * Input conversion stopped due to an incomplete character or shift
  * sequence at the end of the input buffer.
+ * 
+ * === Superclass
+ * 
+ * ArgumentError
+ * 
+ * === Included Modules
+ * 
+ * Iconv::Failure
  */
 
 /*
  * Document-class: Iconv::OutOfRange
  * 
  * Iconv library internal error.  Must not occur.
- */
-
-/*
- * Document-class: Iconv::BrokenLibrary
  * 
- * Detected a bug of underlying iconv(3) libray.
- * * returns an error without setting errno properly
+ * === Superclass
+ * 
+ * RuntimeError
+ * 
+ * === Included Modules
+ * 
+ * Iconv::Failure
  */
 
 void
@@ -889,22 +868,18 @@ Init_iconv _((void))
     rb_define_method(rb_eIconvFailure, "failed", iconv_failure_failed, 0);
     rb_define_method(rb_eIconvFailure, "inspect", iconv_failure_inspect, 0);
 
-    rb_eIconvInvalidEncoding = rb_define_class_under(rb_cIconv, "InvalidEncoding", rb_eArgError);
     rb_eIconvIllegalSeq = rb_define_class_under(rb_cIconv, "IllegalSequence", rb_eArgError);
     rb_eIconvInvalidChar = rb_define_class_under(rb_cIconv, "InvalidCharacter", rb_eArgError);
     rb_eIconvOutOfRange = rb_define_class_under(rb_cIconv, "OutOfRange", rb_eRuntimeError);
-    rb_eIconvBrokenLibrary = rb_define_class_under(rb_cIconv, "BrokenLibrary", rb_eRuntimeError);
-    rb_include_module(rb_eIconvInvalidEncoding, rb_eIconvFailure);
     rb_include_module(rb_eIconvIllegalSeq, rb_eIconvFailure);
     rb_include_module(rb_eIconvInvalidChar, rb_eIconvFailure);
     rb_include_module(rb_eIconvOutOfRange, rb_eIconvFailure);
-    rb_include_module(rb_eIconvBrokenLibrary, rb_eIconvFailure);
 
     rb_success = rb_intern("success");
     rb_failed = rb_intern("failed");
 
-    rb_gc_register_address(&charset_map);
     charset_map = rb_hash_new();
+    rb_gc_register_address(&charset_map);
     rb_define_singleton_method(rb_cIconv, "charset_map", charset_map_get, 0);
 }
 
diff --git a/ext/io/wait/extconf.rb b/ext/io/wait/extconf.rb
index 1352ef202e..ea7dc9f6cf 100644
--- a/ext/io/wait/extconf.rb
+++ b/ext/io/wait/extconf.rb
@@ -3,15 +3,10 @@ target = "io/wait"
 
 unless macro_defined?("DOSISH", "#include <ruby.h>")
   fionread = %w[sys/ioctl.h sys/filio.h].find do |h|
-    checking_for("FIONREAD") {have_macro("FIONREAD", h)}
+    checking_for("FIONREAD") {macro_defined?("FIONREAD", "#include <#{h}>\n")}
   end
   if fionread
     $defs << "-DFIONREAD_HEADER=\"<#{fionread}>\""
     create_makefile(target)
   end
-else
-  if have_func("rb_w32_ioctlsocket", "ruby.h")
-    have_func("rb_w32_is_socket", "ruby.h")
-    create_makefile(target)
-  end
 end
diff --git a/ext/io/wait/lib/nonblock.rb b/ext/io/wait/lib/nonblock.rb
index 2103fdf25b..46511fb40c 100644
--- a/ext/io/wait/lib/nonblock.rb
+++ b/ext/io/wait/lib/nonblock.rb
@@ -20,4 +20,4 @@ class IO
   ensure
     self.nonblock = nb
   end
-end if defined?(Fcntl::F_GETFL)
+end
diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c
index 0e48f705d2..53d5bd7d18 100644
--- a/ext/io/wait/wait.c
+++ b/ext/io/wait/wait.c
@@ -2,8 +2,8 @@
 
   io/wait.c -
 
-  $Author: nobu $
-  $Date: 2005/07/18 03:24:04 $
+  $Author$
+  $Date$
   created at: Tue Aug 28 09:08:06 JST 2001
 
   All the files in this distribution are covered under the Ruby's
@@ -15,24 +15,7 @@
 #include "rubyio.h"
 
 #include <sys/types.h>
-#if defined(FIONREAD_HEADER)
 #include FIONREAD_HEADER
-#endif
-
-#ifdef HAVE_RB_W32_IOCTLSOCKET
-#define ioctl ioctlsocket
-#define ioctl_arg u_long
-#define ioctl_arg2num(i) ULONG2NUM(i)
-#else
-#define ioctl_arg int
-#define ioctl_arg2num(i) INT2NUM(i)
-#endif
-
-#ifdef HAVE_RB_W32_IS_SOCKET
-#define FIONREAD_POSSIBLE_P(fd) rb_w32_is_socket(fd)
-#else
-#define FIONREAD_POSSIBLE_P(fd) ((fd),Qtrue)
-#endif
 
 static VALUE io_ready_p _((VALUE io));
 static VALUE io_wait _((int argc, VALUE *argv, VALUE io));
@@ -58,16 +41,15 @@ io_ready_p(io)
 {
     OpenFile *fptr;
     FILE *fp;
-    ioctl_arg n;
+    int n;
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
-    if (!FIONREAD_POSSIBLE_P(fileno(fptr->f))) return Qfalse;
     fp = fptr->f;
     if (feof(fp)) return Qfalse;
     if (rb_read_pending(fp)) return Qtrue;
     if (ioctl(fileno(fp), FIONREAD, &n)) rb_sys_fail(0);
-    if (n > 0) return ioctl_arg2num(n);
+    if (n > 0) return INT2NUM(n);
     return Qnil;
 }
 
@@ -87,8 +69,7 @@ io_wait(argc, argv, io)
     OpenFile *fptr;
     fd_set rd;
     FILE *fp;
-    int fd;
-    ioctl_arg n;
+    int fd, n;
     VALUE timeout;
     struct timeval *tp, timerec;
 
@@ -112,7 +93,6 @@ io_wait(argc, argv, io)
     if (rb_thread_select(fd + 1, &rd, NULL, NULL, tp) < 0)
 	rb_sys_fail(0);
     rb_io_check_closed(fptr);
-    if (!FIONREAD_POSSIBLE_P(fileno(fptr->f))) return Qfalse;
     if (ioctl(fileno(fp), FIONREAD, &n)) rb_sys_fail(0);
     if (n > 0) return io;
     return Qnil;
diff --git a/ext/nkf/lib/kconv.rb b/ext/nkf/lib/kconv.rb
index 711a3c10a1..1fd28a5a59 100644
--- a/ext/nkf/lib/kconv.rb
+++ b/ext/nkf/lib/kconv.rb
@@ -1,73 +1,82 @@
-#
-# kconv.rb - Kanji Converter.
-#
-# $Id: kconv.rb,v 1.3.6.6 2006/06/19 14:52:54 naruse Exp $
-#
-# ----
-#
-# kconv.rb implements the Kconv class for Kanji Converter.  Additionally,
-# some methods in String classes are added to allow easy conversion.
-#
-
 require 'nkf'
 
-#
-# Kanji Converter for Ruby.
-#
 module Kconv
-  #
-  # Public Constants
-  #
-  
   #Constant of Encoding
-  
-  # Auto-Detect
-  AUTO = NKF::AUTO
-  # ISO-2022-JP
-  JIS = NKF::JIS
-  # EUC-JP
-  EUC = NKF::EUC
-  # Shift_JIS
-  SJIS = NKF::SJIS
-  # BINARY
-  BINARY = NKF::BINARY
-  # NOCONV
-  NOCONV = NKF::NOCONV
-  # ASCII
-  ASCII = NKF::ASCII
-  # UTF-8
-  UTF8 = NKF::UTF8
-  # UTF-16
-  UTF16 = NKF::UTF16
-  # UTF-32
-  UTF32 = NKF::UTF32
-  # UNKNOWN
-  UNKNOWN = NKF::UNKNOWN
-
-  #
-  # Private Constants
-  #
-  
-  # Revision of kconv.rb
-  REVISION = %q$Revision: 1.3.6.6 $
+  AUTO = ::NKF::AUTO
+  JIS = ::NKF::JIS
+  EUC = ::NKF::EUC
+  SJIS = ::NKF::SJIS
+  BINARY = ::NKF::BINARY
+  NOCONV = ::NKF::NOCONV
+  ASCII = ::NKF::ASCII
+  UTF8 = ::NKF::UTF8
+  UTF16 = ::NKF::UTF16
+  UTF32 = ::NKF::UTF32
+  UNKNOWN = ::NKF::UNKNOWN
   
   #Regexp of Encoding
-  
-  # Regexp of Shift_JIS string (private constant)
+  Iconv_Shift_JIS = /\A(?:
+		  [\x00-\x7f\xa1-\xdf]                                             |
+		  \x81[\x40-\x7e\x80-\xac\xb8-\xbf\xc8-\xce\xda-\xe8\xf0-\xf7\xfc] |
+		  \x82[\x4f-\x58\x60-\x79\x81-\x9a\x9f-\xf1]                       |
+		  \x83[\x40-\x7e\x80-\x96\x9f-\xb6\xbf-\xd6\x40-\x60]              |
+		  \x84[\x40-\x60\x70-\x7e\x80-\x91\x9f-\xbe\x9f-\xfc]              |
+		  [\x89-\x8f\x90-\x97\x99-\x9f\xe0-\xea][\x40-\x7e]                |
+		  [\x89-\x97\x99-\x9f\xe0-\xe9][\x80-\xfc]                         |
+		  \x98[\x40-\x72\x9f-\xfc]                                         |
+		  \xea[\x80-\xa4]
+		 )*\z/nx
+  Iconv_EUC_JP = /\A(?:
+	       [\x00-\x7f]                                             |
+	       \x8e        [\xa1-\xdf]                                 |
+	       \x8f        [\xa1-\xdf] [\xa1-\xdf]                     |
+	       [\xa1\xb0-\xbce\xd0-\xf3][\xa1-\xfe]                    |
+	       \xa2[\xa1-\xae\xba-\xc1\xca-\xd0\xdc-\xea\xf2-\xf9\xfe] |
+	       \xa3[\xb0-\xb9\xc1-\xda\xe1-\xfa]                       |
+	       \xa4[\xa1-\xf3]                                         |
+	       \xa5[\xa1-\xf6]                                         |
+	       \xa6[\xa1-\xb8\xc1-\xd8]                                |
+	       \xa7[\xa1-\xc1\xd1-\xf1]                                |
+	       \xa8[\xa1-\xc0]                                         |
+	       \xcf[\xa1-\xd3]                                         |
+	       \xf4[\xa1-\xa6]
+	      )*\z/nx
+  Iconv_UTF8  = /\A(?:\xef\xbb\xbf)?(?:
+  [\x00-\x7f]                                                       |
+  \xc2[\x80-\x8d\x90-\x9f\xa1\xaa\xac\xae-\xb1\xb4\xb6\xb8\xba\xbf] |
+  \xc3[\x80-\xbf]                                                   |
+  \xc4[\x80-\x93\x96-\xa2\xa4-\xab\xae-\xbf]                        |
+  \xc5[\x80-\x8d\x90-\xbe]                                          |
+  \xc7[\x8d-\x9c\xb5]                                               |
+  \xcb[\x87\x98-\x9b\x9d]                                           |
+  \xce[\x84-\x86\x88-\x8a\x8c\x8e-\xa1\xa3-\xbf]                    |
+  \xcf[\x80-\x8e]                                                   |
+  \xd0[\x81-\x8c\x8e-\xbf]                                          |
+  \xd1[\x80-\x8f\x91-\x9f]                                          |
+  \xe2\x84[\x83\x96\xa2\xab]                                        |
+  \xe2\x86[\x83\x91-\x93\x96\xa2\xab]                               |
+  \xe2\x87[\x83\x91-\x94\x96\xa2\xab]                               |
+  \xe2\x88[\x82-\x83\x87-\x88\x8b\x91-\x94\x96\x9a\x9d-\x9e\xa0\xa2\xa7-\xac\xb4-\xb5\xbd]  |
+  \xe2\x89[\x82-\x83\x87-\x88\x8b\x91-\x94\x96\x9a\x9d-\x9e\xa0-\xa2\xa6-\xac\xb4-\xb5\xbd] |
+  \xe2[\x8a\x8c][\x82-\x83\x86-\x88\x8b\x91-\x94\x96\x9a\x9d-\x9e\xa0-\xa2\xa5-\xac\xb4-\xb5\xbd] |
+  \xe2[\x94-\x99][\x81-\x83\x86-\x88\x8b-\x8c\x8f-\x94\x96-\x98\x9a-\x9e\xa0-\xac\xaf-\xb0\xb3-\xb5\xb7-\xb8\xbb-\xbd\xbf] |
+  \xe3\x80[\x81-\x83\x85-\x98\x9a-\x9e\xa0-\xad\xaf-\xb0\xb2-\xb5\xb7-\xb8\xbb-\xbd\xbf] |
+  \xe3[\x81-\x83\xb8-\xbf][\x81-\xbf]          |
+  [\xe5-\xe7][\x80-\xbf][\x81-\xbf]            |
+  \xe8[\x80-\xae\xb0-\xbf][\x81-\xbf]          |
+  \xe9[\x80-\x92\x95-\xb1\xb3-\xbe][\x81-\xbf] |
+  \xef[\xbc-\xbe][\x81-\xbf]                   |
+  )*\z/nx
   RegexpShiftjis = /\A(?:
 		       [\x00-\x7f\xa1-\xdf] |
 		       [\x81-\x9f\xe0-\xfc][\x40-\x7e\x80-\xfc] 
 		      )*\z/nx
-
-  # Regexp of EUC-JP string (private constant)
   RegexpEucjp = /\A(?:
 		    [\x00-\x7f]                         |
 		    \x8e        [\xa1-\xdf]             |
-		    \x8f        [\xa1-\xdf] [\xa1-\xfe] |
-		    [\xa1-\xdf] [\xa1-\xfe]
+		    \x8f        [\xa1-\xdf] [\xa1-\xdf] |
+		    [\xa1-\xdf] [\xa1-\xdf]
 		   )*\z/nx
-
-  # Regexp of UTF-8 string (private constant)
   RegexpUtf8  = /\A(?:
 		    [\x00-\x7f]                                     |
 		    [\xc2-\xdf] [\x80-\xbf]                         |
@@ -79,19 +88,9 @@ module Kconv
 		   )*\z/nx
 
   #
-  # Public Methods
+  # kconv
   #
   
-  # call-seq:
-  #    Kconv.kconv(str, out_code, in_code = Kconv::AUTO)
-  #
-  # Convert <code>str</code> to out_code.
-  # <code>out_code</code> and <code>in_code</code> are given as constants of Kconv.
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want to decode them, use NKF.nkf.
   def kconv(str, out_code, in_code = AUTO)
     opt = '-'
     case in_code
@@ -102,9 +101,8 @@ module Kconv
     when ::NKF::SJIS
       opt << 'S'
     when ::NKF::UTF8
-      opt << 'W'
     when ::NKF::UTF16
-      opt << 'W16'
+      opt << 'W'
     end
 
     case out_code
@@ -115,9 +113,8 @@ module Kconv
     when ::NKF::SJIS
       opt << 's'
     when ::NKF::UTF8
-      opt << 'w'
     when ::NKF::UTF16
-      opt << 'w16'
+      opt << 'w'
     when ::NKF::NOCONV
       return str
     end
@@ -132,73 +129,28 @@ module Kconv
   # Encode to
   #
 
-  # call-seq:
-  #    Kconv.tojis(str)   -> string
-  #
-  # Convert <code>str</code> to ISO-2022-JP
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-jxm0', str).
   def tojis(str)
-    ::NKF::nkf('-jm', str)
+    ::NKF::nkf('-j', str)
   end
   module_function :tojis
 
-  # call-seq:
-  #    Kconv.toeuc(str)   -> string
-  #
-  # Convert <code>str</code> to EUC-JP
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-exm0', str).
   def toeuc(str)
-    ::NKF::nkf('-em0', str)
+    ::NKF::nkf('-e', str)
   end
   module_function :toeuc
 
-  # call-seq:
-  #    Kconv.tosjis(str)   -> string
-  #
-  # Convert <code>str</code> to Shift_JIS
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-sxm0', str).
   def tosjis(str)
-    ::NKF::nkf('-sm', str)
+    ::NKF::nkf('-s', str)
   end
   module_function :tosjis
 
-  # call-seq:
-  #    Kconv.toutf8(str)   -> string
-  #
-  # Convert <code>str</code> to UTF-8
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-wxm0', str).
   def toutf8(str)
-    ::NKF::nkf('-wm', str)
+    ::NKF::nkf('-w', str)
   end
   module_function :toutf8
 
-  # call-seq:
-  #    Kconv.toutf16(str)   -> string
-  #
-  # Convert <code>str</code> to UTF-16
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-w16xm0', str).
   def toutf16(str)
-    ::NKF::nkf('-w16m', str)
+    ::NKF::nkf('-w16', str)
   end
   module_function :toutf16
 
@@ -206,21 +158,13 @@ module Kconv
   # guess
   #
 
-  # call-seq:
-  #    Kconv.guess(str)   -> integer
-  #
-  # Guess input encoding by NKF.guess2
   def guess(str)
     ::NKF::guess(str)
   end
   module_function :guess
 
-  # call-seq:
-  #    Kconv.guess_old(str)   -> integer
-  #
-  # Guess input encoding by NKF.guess1
   def guess_old(str)
-    ::NKF::guess1(str)
+    ::NKF::guess_old(str)
   end
   module_function :guess_old
 
@@ -228,34 +172,16 @@ module Kconv
   # isEncoding
   #
 
-  # call-seq:
-  #    Kconv.iseuc(str)   -> obj or nil
-  #
-  # Returns whether input encoding is EUC-JP or not.
-  #
-  # *Note* don't expect this return value is MatchData.
   def iseuc(str)
     RegexpEucjp.match( str )
   end
   module_function :iseuc
 
-  # call-seq:
-  #    Kconv.issjis(str)   -> obj or nil
-  #
-  # Returns whether input encoding is Shift_JIS or not.
-  #
-  # *Note* don't expect this return value is MatchData.
   def issjis(str)
     RegexpShiftjis.match( str )
   end
   module_function :issjis
 
-  # call-seq:
-  #    Kconv.isutf8(str)   -> obj or nil
-  #
-  # Returns whether input encoding is UTF-8 or not.
-  #
-  # *Note* don't expect this return value is MatchData.
   def isutf8(str)
     RegexpUtf8.match( str )
   end
@@ -264,104 +190,37 @@ module Kconv
 end
 
 class String
-  # call-seq:
-  #    String#kconv(out_code, in_code = Kconv::AUTO)
-  #
-  # Convert <code>self</code> to out_code.
-  # <code>out_code</code> and <code>in_code</code> are given as constants of Kconv.
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want to decode them, use NKF.nkf.
   def kconv(out_code, in_code=Kconv::AUTO)
     Kconv::kconv(self, out_code, in_code)
   end
   
-  #
   # to Encoding
-  #
+  def tojis
+    ::NKF::nkf('-j', self)
+  end
+  def toeuc
+    ::NKF::nkf('-e', self)
+  end
+  def tosjis
+    ::NKF::nkf('-s', self)
+  end
+  def toutf8
+    ::NKF::nkf('-w', self)
+  end
+  def toutf16
+    ::NKF::nkf('-w16', self)
+  end
   
-  # call-seq:
-  #    String#tojis   -> string
-  #
-  # Convert <code>self</code> to ISO-2022-JP
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-jxm0', str).
-  def tojis; Kconv.tojis(self) end
-
-  # call-seq:
-  #    String#toeuc   -> string
-  #
-  # Convert <code>self</code> to EUC-JP
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-exm0', str).
-  def toeuc; Kconv.toeuc(self) end
-
-  # call-seq:
-  #    String#tosjis   -> string
-  #
-  # Convert <code>self</code> to Shift_JIS
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-sxm0', str).
-  def tosjis; Kconv.tosjis(self) end
-
-  # call-seq:
-  #    String#toutf8   -> string
-  #
-  # Convert <code>self</code> to UTF-8
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-wxm0', str).
-  def toutf8; Kconv.toutf8(self) end
-
-  # call-seq:
-  #    String#toutf16   -> string
-  #
-  # Convert <code>self</code> to UTF-16
-  #
-  # *Note*
-  # This method decode MIME encoded string and
-  # convert halfwidth katakana to fullwidth katakana.
-  # If you don't want it, use NKF.nkf('-w16xm0', str).
-  def toutf16; Kconv.toutf16(self) end
-
-  #
   # is Encoding
-  #
-
-  # call-seq:
-  #    String#iseuc   -> obj or nil
-  #
-  # Returns whether <code>self</code>'s encoding is EUC-JP or not.
-  #
-  # *Note* don't expect this return value is MatchData.
-  def iseuc;	Kconv.iseuc(self) end
+  def iseuc
+    Kconv.iseuc( self )
+  end
 
-  # call-seq:
-  #    String#issjis   -> obj or nil
-  #
-  # Returns whether <code>self</code>'s encoding is Shift_JIS or not.
-  #
-  # *Note* don't expect this return value is MatchData.
-  def issjis;	Kconv.issjis(self) end
+  def issjis
+    Kconv.issjis( self )
+  end
 
-  # call-seq:
-  #    String#isutf8   -> obj or nil
-  #
-  # Returns whether <code>self</code>'s encoding is UTF-8 or not.
-  #
-  # *Note* don't expect this return value is MatchData.
-  def isutf8;	Kconv.isutf8(self) end
+  def isutf8
+    Kconv.isutf8( self )
+  end
 end
diff --git a/ext/nkf/nkf-utf8/config.h b/ext/nkf/nkf-utf8/config.h