From 63436b3ff215e0b38c76ced4e5c1c1bba41dad62 Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 23 Mar 2016 05:25:29 +0000 Subject: [PATCH] * lib/rdoc/ri/driver.rb (interactive): rescue NotFoundError raised in expand_name. (display_name rescues NotFoundError by itself, the original logic looks buggy...) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/rdoc/ri/driver.rb | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4bac253cd0..91252c4a2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Mar 23 14:23:54 2016 NARUSE, Yui + + * 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 * marshal.c (r_long): cast to `signed char`, which is used diff --git a/lib/rdoc/ri/driver.rb b/lib/rdoc/ri/driver.rb index e571ae82ac..43c84ffa90 100644 --- a/lib/rdoc/ri/driver.rb +++ b/lib/rdoc/ri/driver.rb @@ -1089,10 +1089,8 @@ The ri pager can be set with the 'RI_PAGER' environment variable or the 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