lib/byebug/processor.rb in byebug-1.0.1 vs lib/byebug/processor.rb in byebug-1.0.2

@@ -123,11 +123,11 @@
       file = CommandProcessor.canonic_file(breakpoint.source)
       line = breakpoint.pos
       if Byebug.annotate.to_i > 2
         print afmt("source #{file}:#{line}")
       end
-      print "Stopped at breakpoint %d at %s:%s\n", n, file, line
+      print "Stopped by breakpoint %d at %s:%s\n", n, file, line
     end
     protect :at_breakpoint
 
     def at_catchpoint(context, excpt)
       aprint 'stopped' if Byebug.annotate.to_i > 2
@@ -145,18 +145,18 @@
     end
     protect :at_catchpoint
 
     def at_tracing(context, file, line)
       # Don't trace ourselves
-      return if defined?(Byebug::RDEBUG_FILE) && Byebug::RDEBUG_FILE == file
+      return if defined?(Byebug::BYEBUG_BIN) && Byebug::BYEBUG_BIN == file
 
       file = CommandProcessor.canonic_file(file)
       tracing_plus = Command.settings[:tracing_plus]
-      if file != @last_file || line != @last_line || tracing_plus
+      if file != @last_file || line != @last_line || tracing_plus == false
         @last_file = file
         @last_line = line
-        print "Tracing: #{file}:#{line} #{Byebug.line_at(file, line)}"
+        print "Tracing: #{file}:#{line} #{Byebug.line_at(file, line)}\n"
       end
       always_run(context, file, line, 2)
     end
     protect :at_tracing
 
@@ -164,12 +164,11 @@
       process_commands(context, file, line)
     end
     protect :at_line
 
     def at_return(context, file, line)
-      context.stop_frame = -1
-      process_commands(context, file, line)
+      #context.stop_frame = -1
     end
 
     private
 
       ##
@@ -242,10 +241,14 @@
             m
           end
         end
 
         preloop(commands, context)
-        CommandProcessor.print_location_and_text(file, line)
+
+        if not Command.settings[:autolist]
+          CommandProcessor.print_location_and_text(file, line)
+        end
+
         while !state.proceed?
           input = if @interface.command_queue.empty?
                     @interface.read_command(prompt(context))
                   else
                     @interface.command_queue.shift