hsbt	2015-08-28 16:05:17 +0900 (Fri, 28 Aug 2015)

  New Revision: 51715

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

  Log:
    * lib/rdoc/*: Update rdoc master(cfffed5)
      https://github.com/rdoc/rdoc/pull/337
      https://github.com/rdoc/rdoc/pull/367

  Modified files:
    trunk/ChangeLog
    trunk/lib/rdoc/generator/template/json_index/js/searcher.js
    trunk/lib/rdoc/rdoc.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 51714)
+++ ChangeLog	(revision 51715)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Aug 28 16:05:09 2015  SHIBATA Hiroshi  <hsbt@r...>
+
+	* lib/rdoc/*: Update rdoc master(cfffed5)
+	  https://github.com/rdoc/rdoc/pull/337
+	  https://github.com/rdoc/rdoc/pull/367
+
 Fri Aug 28 10:16:20 2015  Koichi Sasada  <ko1@a...>
 
 	* vm.c (hook_before_rewind): prevent kicking :return event while
Index: lib/rdoc/generator/template/json_index/js/searcher.js
===================================================================
--- lib/rdoc/generator/template/json_index/js/searcher.js	(revision 51714)
+++ lib/rdoc/generator/template/json_index/js/searcher.js	(revision 51715)
@@ -52,13 +52,13 @@ Searcher.prototype = new function() { https://github.com/ruby/ruby/blob/trunk/lib/rdoc/generator/template/json_index/js/searcher.js#L52
   /*  ----- Utilities ------  */
   function splitQuery(query) {
     return jQuery.grep(query.split(/(\s+|::?|\(\)?)/), function(string) {
-      return string.match(/\S/)
+      return string.match(/\S/);
     });
   }
 
   function buildRegexps(queries) {
     return jQuery.map(queries, function(query) {
-      return new RegExp(query.replace(/(.)/g, '([$1])([^$1]*?)'), 'i')
+      return new RegExp(query.replace(/(.)/g, '([$1])([^$1]*?)'), 'i');
     });
   }
 
Index: lib/rdoc/rdoc.rb
===================================================================
--- lib/rdoc/rdoc.rb	(revision 51714)
+++ lib/rdoc/rdoc.rb	(revision 51715)
@@ -353,7 +353,11 @@ option) https://github.com/ruby/ruby/blob/trunk/lib/rdoc/rdoc.rb#L353
     return unless content
 
     filename_path = Pathname(filename).expand_path
-    relative_path = filename_path.relative_path_from @options.root
+    begin
+      relative_path = filename_path.relative_path_from @options.root
+    rescue ArgumentError
+      relative_path = filename_path
+    end
 
     if @options.page_dir and
        relative_path.to_s.start_with? @options.page_dir.to_s then

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