1 files changed, 27 insertions, 8 deletions
diff --git a/gem_prelude.rb b/gem_prelude.rb
index be9c41933c..1b78d80c72 100644
--- a/gem_prelude.rb
+++ b/gem_prelude.rb
@@ -1,8 +1,27 @@
-if defined?(Gem)
-  require 'rubygems.rb'
-  begin
-    gem 'did_you_mean'
-    require 'did_you_mean'
-  rescue Gem::LoadError, LoadError
-  end if defined?(DidYouMean)
-end
+begin
+  require 'rubygems'
+rescue LoadError => e
+  raise unless e.path == 'rubygems'
+
+  warn "`RubyGems' were not loaded."
+else
+  require 'bundled_gems'
+end if defined?(Gem)
+
+begin
+  require 'error_highlight'
+rescue LoadError
+  warn "`error_highlight' was not loaded."
+end if defined?(ErrorHighlight)
+
+begin
+  require 'did_you_mean'
+rescue LoadError
+  warn "`did_you_mean' was not loaded."
+end if defined?(DidYouMean)
+
+begin
+  require 'syntax_suggest/core_ext'
+rescue LoadError
+  warn "`syntax_suggest' was not loaded."
+end if defined?(SyntaxSuggest)