1 files changed, 11 insertions, 1 deletions
diff --git a/lib/debug.rb b/lib/debug.rb
index 432c7b4d19..90270a3fe7 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -11,6 +11,8 @@ class DEBUGGER__
     @scripts = {}
   end
 
+  DEBUG_LAST_CMD = []
+
   def interrupt
     @stop_next = 1
   end
@@ -40,6 +42,11 @@ class DEBUGGER__
     STDOUT.flush
     while input = STDIN.gets
       input.chop!
+      if input == ""
+	input = DEBUG_LAST_CMD[0]
+      else
+	DEBUG_LAST_CMD[0] = input
+      end
       case input
       when /^b(reak)?\s+(([^:\n]+:)?.+)/
 	pos = $2
@@ -169,7 +176,7 @@ class DEBUGGER__
 	  printf "no sourcefile available for %s\n", file
 	end
       when /^p\s+/
-	p debug_eval($', binding)
+	p debug_eval($', binding) #'
       else
 	v = debug_eval(input, binding)
 	p v unless v == nil
@@ -187,10 +194,13 @@ class DEBUGGER__
       return "\n" unless line
       return line
     end
+    save = $DEBUG
     begin
+      $DEBUG = FALSE
       f = open(file)
       lines = @scripts[file] = f.readlines
     rescue
+      $DEBUG = save
       @scripts[file] = TRUE
       return "\n"
     end