naruse	2016-03-23 14:25:29 +0900 (Wed, 23 Mar 2016)

  New Revision: 54235

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54235

  Log:
    * lib/rdoc/ri/driver.rb (interactive): rescue NotFoundError raised in
      expand_name. (display_name rescues NotFoundError by itself,
      the original logic looks buggy...)

  Modified files:
    trunk/ChangeLog
    trunk/lib/rdoc/ri/driver.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 54234)
+++ ChangeLog	(revision 54235)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Mar 23 14:23:54 2016  NARUSE, Yui  <naruse@r...>
+
+	* lib/rdoc/ri/driver.rb (interactive): rescue NotFoundError raised in
+	  expand_name. (display_name rescues NotFoundError by itself,
+	  the original logic looks buggy...)
+
 Wed Mar 23 11:44:53 2016  cremno  <cremno@m...>
 
 	* marshal.c (r_long): cast to `signed char`, which is used
Index: lib/rdoc/ri/driver.rb
===================================================================
--- lib/rdoc/ri/driver.rb	(revision 54234)
+++ lib/rdoc/ri/driver.rb	(revision 54235)
@@ -1089,10 +1089,8 @@ The ri pager can be set with the 'RI_PAG https://github.com/ruby/ruby/blob/trunk/lib/rdoc/ri/driver.rb#L1089
 
       return if name.nil? or name.empty?
 
-      name = expand_name name.strip
-
       begin
-        display_name name
+        display_name expand_name(name.strip)
       rescue NotFoundError => e
         puts e.message
       end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/