From 80b0c6ca3b15a621dbbe129f4770c7a2f404eebe Mon Sep 17 00:00:00 2001 From: keiju Date: Fri, 28 Dec 2012 12:49:19 +0000 Subject: [PATCH] * lib/irb/context.rb: IRB::Context#new: Check from JobManager inside IRB namespace [Bug #7628]. Thanks rafaelfranca for bug report and its patch. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38643 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/irb/context.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f2121fe438..20831bf20b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Dec 28 21:40:36 2012 Keiju Ishitsuka + + * lib/irb/context.rb: IRB::Context#new: Check from JobManager + inside IRB namespace [Bug #7628]. Thanks rafaelfranca for bug + report and its patch. + Fri Dec 28 17:06:17 2012 Akinori MUSHA * misc/ruby-electric.el (ruby-electric-curlies): Automatically diff --git a/lib/irb/context.rb b/lib/irb/context.rb index 8358bc3a59..d6dfa1847a 100644 --- a/lib/irb/context.rb +++ b/lib/irb/context.rb @@ -54,7 +54,7 @@ module IRB self.prompt_mode = IRB.conf[:PROMPT_MODE] - if IRB.conf[:SINGLE_IRB] or !defined?(JobManager) + if IRB.conf[:SINGLE_IRB] or !defined?(IRB::JobManager) @irb_name = IRB.conf[:IRB_NAME] else @irb_name = IRB.conf[:IRB_NAME]+"#"+IRB.JobManager.n_jobs.to_s