usa	2012-02-14 16:58:23 +0900 (Tue, 14 Feb 2012)

  New Revision: 34596

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34596

  Log:
    merge revision(s) 33254:
    
    * lib/rake/file_list.rb (Rake::FileList#egrep): there is no need to
      open files in binary mode.
      see more details in https://github.com/jimweirich/rake/issues/74

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/rake/file_list.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34595)
+++ ruby_1_9_3/ChangeLog	(revision 34596)
@@ -1,3 +1,9 @@
+Tue Feb 14 16:57:11 2012  NAKAMURA Usaku  <usa@r...>
+
+	* lib/rake/file_list.rb (Rake::FileList#egrep): there is no need to
+	  open files in binary mode.
+	  see more details in https://github.com/jimweirich/rake/issues/74
+
 Tue Feb 14 16:52:17 2012  NAKAMURA Usaku  <usa@r...>
 
 	* lib/rdoc/encoding.rb (RDoc::Encoding.read_file): fixup newline chars
Index: ruby_1_9_3/lib/rake/file_list.rb
===================================================================
--- ruby_1_9_3/lib/rake/file_list.rb	(revision 34595)
+++ ruby_1_9_3/lib/rake/file_list.rb	(revision 34596)
@@ -286,7 +286,7 @@
       matched = 0
       each do |fn|
         begin
-          open(fn, "rb", *options) do |inf|
+          open(fn, "r:ascii-8bit", *options) do |inf|
             count = 0
             inf.each do |line|
               count += 1
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34595)
+++ ruby_1_9_3/version.h	(revision 34596)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 109
+#define RUBY_PATCHLEVEL 110
 
 #define RUBY_RELEASE_DATE "2012-02-14"
 #define RUBY_RELEASE_YEAR 2012

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/