From d14b60fff0cc5d10b4573172d343411035e01ead Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 10 Feb 2012 21:14:03 +0000 Subject: 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 --- ChangeLog | 6 ++++++ dir.c | 2 +- version.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 081418eb52..4317ea4ff5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Feb 11 06:13:07 2012 NARUSE, Yui + + * 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 * io.c (rb_sys_fail_path): move the definition. diff --git a/dir.c b/dir.c index 128e2c8c8f..c530387df7 100644 --- a/dir.c +++ b/dir.c @@ -1911,7 +1911,7 @@ dir_entries(int argc, VALUE *argv, VALUE io) * match all files beginning with * c; *c will match * all files ending with c; and - * *c* will match all files that + * \*c* will match all files that * have c in them (including at * the beginning or end). Equivalent to * / .* /x in regexp. diff --git a/version.h b/version.h index 33a48c3a88..86be8da85d 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3