From bb7025b7e837e44100c982a3fa294f1f265374fe Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Tue, 17 Sep 2024 12:36:19 +0900
Subject: [PATCH] Activate irb if irb is bundled gems

---
 prelude.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/prelude.rb b/prelude.rb
index 2f67f528e9..55b42f06c4 100644
--- a/prelude.rb
+++ b/prelude.rb
@@ -1,8 +1,12 @@
 class Binding
   # :nodoc:
   def irb
-    force_activate 'irb'
-    require 'irb'
+    begin
+      require 'irb'
+    rescue LoadError, Gem::LoadError
+      force_activate 'irb'
+      retry
+    end
     irb
   end
 
@@ -10,8 +14,6 @@ class Binding
   alias irb irb # :nodoc:
 
   private def force_activate(gem)
-    return if !defined?(Bundler) || Gem.loaded_specs.key?(gem)
-
     Bundler.reset!
 
     builder = Bundler::Dsl.new