merges r24226 from trunk into ruby_1_9_1.

--
 * lib/tracer.rb: no show lines unkonwn line number. [ruby-core:22096],
   no trace display  c-call and c-return as default.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 75fab51743..43561cc25c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul 21 20:41:20 2009  Keiju Ishitsuka  <keiju@emperor2.pendome>
+
+	* lib/tracer.rb: no show lines unkonwn line number. [ruby-core:22096],
+          no trace display  c-call and c-return as default.
+
 Tue Jul 21 16:07:57 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/tracer.rb: toplevel caller exists now.  [ruby-core:24454]
diff --git a/lib/tracer.rb b/lib/tracer.rb
index 76a8723ff0..9d197a638a 100644
--- a/lib/tracer.rb
+++ b/lib/tracer.rb
@@ -125,7 +125,7 @@ class Tracer
       line,
       klass || '',
       EVENT_SYMBOL[event],
-      get_line(file, line))
+      line == 0 ? "?\n" : get_line(file, line))
     # Thread.critical = saved_crit
   end
 
diff --git a/version.h b/version.h
index cb3ef7938a..befb790a8c 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 250
+#define RUBY_PATCHLEVEL 251
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1