archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 18:13:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merges r23724 and r23725 from trunk into ruby_1_9_1.

Browse source 
--
* load.c (rb_f_require): RDoc updated.  a patch from Run Paint Run
  Run in [ruby-core:23833].
--
* load.c (rb_mod_autoload): ditto.  [ruby-core:23835]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23795 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-06-21 09:17:12 +00:00
parent 341c1cb7f8
commit eb556f53d4
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Wed Jun 17 16:57:40 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* load.c (rb_f_require): RDoc updated. a patch from Run Paint Run
Run in [ruby-core:23833].
* load.c (rb_mod_autoload): ditto. [ruby-core:23835]
Wed Jun 17 12:37:37 2009 Yukihiro Matsumoto <matz@ruby-lang.org> Wed Jun 17 12:37:37 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* thread.c (ruby_thread_stack_overflow): call rb_exc_raise() on * thread.c (ruby_thread_stack_overflow): call rb_exc_raise() on

10
load.c
View file

@ -415,10 +415,10 @@ load_unlock(const char *ftptr, int done)
* the current platform, Ruby loads the shared library as a Ruby * the current platform, Ruby loads the shared library as a Ruby
* extension. Otherwise, Ruby tries adding ``.rb'', ``.so'', and so on * extension. Otherwise, Ruby tries adding ``.rb'', ``.so'', and so on
* to the name. The name of the loaded feature is added to the array in * to the name. The name of the loaded feature is added to the array in
* <code>$"</code>. A feature will not be loaded if it's name already * <code>$"</code>. A feature will not be loaded if its name already
* appears in <code>$"</code>. However, the file name is not converted * appears in <code>$"</code>. The file name is converted to an absolute
* to an absolute path, so that ``<code>require 'a';require * path, so ``<code>require 'a'; require './a'</code>'' will not load
* './a'</code>'' will load <code>a.rb</code> twice. * <code>a.rb</code> twice.
* *
* require "my-library.rb" * require "my-library.rb"
* require "db-driver" * require "db-driver"
@ -627,7 +627,7 @@ ruby_init_ext(const char *name, void (*init)(void))
/* /*
* call-seq: * call-seq:
* mod.autoload(name, filename) => nil * mod.autoload(module, filename) => nil
* *
* Registers _filename_ to be loaded (using <code>Kernel::require</code>) * Registers _filename_ to be loaded (using <code>Kernel::require</code>)
* the first time that _module_ (which may be a <code>String</code> or * the first time that _module_ (which may be a <code>String</code> or

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "1.9.1" #define RUBY_VERSION "1.9.1"
#define RUBY_RELEASE_DATE "2009-05-22" #define RUBY_RELEASE_DATE "2009-05-22"
#define RUBY_PATCHLEVEL 185 #define RUBY_PATCHLEVEL 186
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1