From c7f28e01c89b6d90b916091380458c43936abde2 Mon Sep 17 00:00:00 2001
From: Scott Barron <scott@elitists.net>
Date: Thu, 2 Nov 2006 05:02:09 +0000
Subject: [PATCH] Merge in [5392] and [5393] from trunk.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5394 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 railties/lib/breakpoint.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/railties/lib/breakpoint.rb b/railties/lib/breakpoint.rb
index fc586bcadb0c8..0220c01fb8d26 100644
--- a/railties/lib/breakpoint.rb
+++ b/railties/lib/breakpoint.rb
@@ -14,6 +14,10 @@
 # one that allows for commercial usage.) If you for
 # some good reason need to use this under another
 # license please contact me.
+"""
+foo
+bar
+"""
 
 require 'irb'
 if RUBY_VERSION == '1.8.5'
@@ -21,11 +25,9 @@
     require 'rubygems'
     require 'breakpoint185'
   rescue LoadError      
-    puts 'WARNING: breakpoints will not work with Ruby 1.8.5 without the call_stack gem.'
-    puts '         gem install call_stack or see http://eigenclass.org/hiki.rb?call_stack'
     def Binding.of_caller(&block)
-      raise 'Breakpoint requires the call_stack gem with Ruby 1.8.5.'
-      return
+      raise """Breakpoints do not work in Ruby 1.8.5 without call_stack.
+gem install call_stack or see http://eigenclass.org/hiki.rb?call_stack"""
     end
   end
 else