From 79aac054745e7f0180c2e3948a6553996b3e7c62 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 4 Jun 2010 21:22:47 +0000
Subject: [PATCH] Clarification of what '*' matches.  Patch by John Wells
 <john.wells at greatworx.com>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog             | 5 +++++
 dir.c                 | 5 ++++-
 lib/irb/ruby-token.rb | 5 -----
 numeric.c             | 1 -
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 84e96d3a3e..8c7a43ff3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun  5 06:20:57 2010  Eric Hodel  <drbrain@segment7.net>
+
+	* dir.c: Clarification of what '*' matches.  Patch by John Wells
+	  <john.wells at greatworx.com>
+
 Fri Jun  4 10:46:33 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/dl/cfunc.c (rb_dlcfunc_inspect): should taint the result.
diff --git a/dir.c b/dir.c
index fa7cdd03ea..cab0cdcc07 100644
--- a/dir.c
+++ b/dir.c
@@ -1741,7 +1741,10 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
  *                          <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.
+ *                          <code>/ .* /x</code> in regexp. Note, this
+ *                          will not match Unix-like hidden files (dotfiles).
+ *                          In order to include those in the match results,
+ *                          you must use something like "{*,.*}".
  *  <code>**</code>::       Matches directories recursively.
  *  <code>?</code>::        Matches any one character. Equivalent to
  *                          <code>/.{1}/</code> in regexp.
diff --git a/lib/irb/ruby-token.rb b/lib/irb/ruby-token.rb
index 9b06eab21b..531fb859ff 100644
--- a/lib/irb/ruby-token.rb
+++ b/lib/irb/ruby-token.rb
@@ -17,11 +17,6 @@ module RubyToken
   EXPR_DOT = :EXPR_DOT
   EXPR_CLASS = :EXPR_CLASS
 
-  # for ruby 1.4X
-  if !defined?(Symbol)
-    Symbol = Integer
-  end
-
   class Token
     def initialize(seek, line_no, char_no)
       @seek = seek
diff --git a/numeric.c b/numeric.c
index 3d42cbd4aa..9ff193c0d5 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1914,7 +1914,6 @@ rb_num2ull(VALUE val)
  *
  */
 
-
 /*
  *  call-seq:
  *     int.to_i      ->  integer