ayumin	2012-01-07 22:47:25 +0900 (Sat, 07 Jan 2012)

  New Revision: 34224

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

  Log:
    merge revision(s) 34204:
    
    * lib/rexml/parsers/baseparser.rb: use private instead of _xxx
      method name. This is Ruby code not Python code.
      refs #5696

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/lib/rexml/parsers/baseparser.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34223)
+++ ruby_1_9_3/ChangeLog	(revision 34224)
@@ -1,3 +1,9 @@
+Sat Jan  7 22:46:36 2012  Kouhei Sutou  <kou@c...>
+
+	* lib/rexml/parsers/baseparser.rb: use private instead of _xxx
+	  method name. This is Ruby code not Python code.
+	  refs #5696
+
 Tue Jan 03 23:57:37 2012  Ayumu AIZAWA  <ayumu.aizawa@g...>
 
 	* lib/rexml/parsers/baseparser.rb: rexml BaseParser uses
Index: ruby_1_9_3/lib/rexml/parsers/baseparser.rb
===================================================================
--- ruby_1_9_3/lib/rexml/parsers/baseparser.rb	(revision 34223)
+++ ruby_1_9_3/lib/rexml/parsers/baseparser.rb	(revision 34224)
@@ -180,14 +180,14 @@
 
       # Returns the next event.  This is a +PullEvent+ object.
       def pull
-        _pull_inner.tap do |event|
+        pull_event.tap do |event|
           @listeners.each do |listener|
             listener.receive event
           end
         end
       end
 
-      def _pull_inner
+      def pull_event
         if @closed
           x, @closed = @closed, nil
           return [ :end_element, x ]
@@ -436,6 +436,7 @@
         end
         return [ :dummy ]
       end
+      private :pull_event
 
       def entity( reference, entities )
         value = nil
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34223)
+++ ruby_1_9_3/version.h	(revision 34224)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 20
+#define RUBY_PATCHLEVEL 21
 
 #define RUBY_RELEASE_DATE "2012-01-07"
 #define RUBY_RELEASE_YEAR 2012

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