4 files changed, 31 insertions, 14 deletions
diff --git a/lib/debug.rb b/lib/debug.rb
index 0caeecb00c..9275b47cd9 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -700,9 +700,11 @@ EOHELP
     @line = line
     case event
     when 'line'
+      p [line, @stop_next]
       frame_set_pos(file, line)
       if !@no_step or @frames.size == @no_step
 	@stop_next -= 1
+	@stop_next = 0 if @stop_next < 0
       elsif @frames.size < @no_step
 	@stop_next = 0		# break here before leaving...
       else
diff --git a/lib/irb/context.rb b/lib/irb/context.rb
index 9022e8138c..f1194f8db9 100644
--- a/lib/irb/context.rb
+++ b/lib/irb/context.rb
@@ -177,6 +177,7 @@ module IRB
       @inspect_mode
     end
 
+    undef use_readline=
     def use_readline=(opt)
       @use_readline = opt
       print "use readline module\n" if @use_readline
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 7ae2349046..9b01d67c4c 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -8,6 +8,7 @@ CONFIG = Config::MAKEFILE_CONFIG
 ORIG_LIBPATH = ENV['LIB']
 
 SRC_EXT = ["c", "cc", "m", "cxx", "cpp", "C"]
+$static = $config_h = nil
 
 unless defined? $configure_args
   $configure_args = {}
diff --git a/lib/timeout.rb b/lib/timeout.rb
index 8c6ccb7128..00e60aff8c 100644
--- a/lib/timeout.rb
+++ b/lib/timeout.rb
@@ -23,25 +23,38 @@
 #
 #    The time in seconds to wait for block teminatation.   
 #
+#  : [exception]
+#
+#    The exception classs to be raised on timeout.
+#
 #=end
 
-class TimeoutError<Interrupt
-end
+module Timeout
+  class Error<Interrupt
+  end
 
-def timeout(sec, exception=TimeoutError)
-  return yield if sec == nil
-  begin
-    x = Thread.current
-    y = Thread.start {
-      sleep sec
-      x.raise exception, "execution expired" if x.alive?
-    }
-    yield sec
-#    return true
-  ensure
-    y.kill if y and y.alive?
+  def timeout(sec, exception=Error)
+    return yield if sec == nil
+    begin
+      x = Thread.current
+      y = Thread.start {
+        sleep sec
+        x.raise exception, "execution expired" if x.alive?
+      }
+      yield sec
+      #    return true
+    ensure
+      y.kill if y and y.alive?
+    end
   end
+  module_function :timeout
+end
+
+# compatible
+def timeout(n, &block)
+  Timeout::timeout(n, &block)
 end
+TimeoutError = Timeout::Error
 
 if __FILE__ == $0
   p timeout(5) {