diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-10 21:14:03 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-10 21:14:03 +0000 |
commit | d14b60fff0cc5d10b4573172d343411035e01ead (patch) | |
tree | 20bb4e3d042d7e5eb1d6a72ffc60aa1fbecdeeaf | |
parent | a208a7507244c3819beff06ddf422066437ed5b5 (diff) |
merge revision(s) 34547:
* dir.c (fnmatch): The * needs to be escaped to avoid formatting in
fnmatch comment.
patched by @dalton. https://github.com/ruby/ruby/pull/91
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | dir.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sat Feb 11 06:13:07 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * dir.c (fnmatch): The * needs to be escaped to avoid formatting in + fnmatch comment. + patched by @dalton. https://github.com/ruby/ruby/pull/91 + Sat Feb 11 03:38:48 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com> * io.c (rb_sys_fail_path): move the definition. @@ -1911,7 +1911,7 @@ dir_entries(int argc, VALUE *argv, VALUE io) * match all files beginning with * <code>c</code>; <code>*c</code> will match * all files ending with <code>c</code>; and - * <code>*c*</code> will match all files that + * <code>\*c*</code> will match all files that * have <code>c</code> in them (including at * the beginning or end). Equivalent to * <code>/ .* /x</code> in regexp. @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 92 +#define RUBY_PATCHLEVEL 93 #define RUBY_RELEASE_DATE "2012-02-11" #define RUBY_RELEASE_YEAR 2012 |