summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-10 21:12:44 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-10 21:12:44 +0000
commitc13d0b0c9cee4757428c5843b2e3217be2ec315c (patch)
tree1b7ffabb0e7c24a77a4a672381b12802c40517af
parent198736fb402b54b79facbaedf6ab57a08aa48341 (diff)
* 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/trunk@34547 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--dir.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c858419d2..7388d14051 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Feb 11 06:00:48 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
+
Fri Feb 10 03:41:31 2012 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/parser.c: removed external encoding setter, allow parser
diff --git a/dir.c b/dir.c
index 1367ed0bda..a97f994cab 100644
--- a/dir.c
+++ b/dir.c
@@ -1907,7 +1907,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.