aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/irb/context.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 455d63c41f..df4bdc13c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 26 21:32:46 2012 Keiju Ishitsuka <keiju@ishitsuka.com>
+
+ * lib/irb/context.rb: make a correct prompt from
+ IRB.conf[:IRB_NAME] on irb [Bug #6338]. Patched by sho-h.
+
Wed Dec 26 21:09:19 2012 Keiju Ishitsuka <keiju@ishitsuka.com>
* lib/irb/ext/math-mode.rb: make not able to change math-mode
diff --git a/lib/irb/context.rb b/lib/irb/context.rb
index b44f8ca2fe..d856f16c1f 100644
--- a/lib/irb/context.rb
+++ b/lib/irb/context.rb
@@ -57,7 +57,7 @@ module IRB
if IRB.conf[:SINGLE_IRB] or !defined?(JobManager)
@irb_name = IRB.conf[:IRB_NAME]
else
- @irb_name = "irb#"+IRB.JobManager.n_jobs.to_s
+ @irb_name = IRB.conf[:IRB_NAME]+"#"+IRB.JobManager.n_jobs.to_s
end
@irb_path = "(" + @irb_name + ")"