naruse	2016-04-15 21:10:04 +0900 (Fri, 15 Apr 2016)

  New Revision: 54597

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54597

  Log:
    merge revision(s) 54596:
    
    * lib/irb/ext/save-history.rb: Fix NoMethodError when method is not defined.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/lib/irb/ext/save-history.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 54596)
+++ ruby_2_3/version.h	(revision 54597)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.0"
 #define RUBY_RELEASE_DATE "2016-04-15"
-#define RUBY_PATCHLEVEL 80
+#define RUBY_PATCHLEVEL 81
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4
Index: ruby_2_3/lib/irb/ext/save-history.rb
===================================================================
--- ruby_2_3/lib/irb/ext/save-history.rb	(revision 54596)
+++ ruby_2_3/lib/irb/ext/save-history.rb	(revision 54597)
@@ -27,7 +27,7 @@ module IRB https://github.com/ruby/ruby/blob/trunk/ruby_2_3/lib/irb/ext/save-history.rb#L27
       IRB.conf[:SAVE_HISTORY]
     end
 
-    remove_method :save_history=
+    remove_method :save_history= if respond_to?(:save_history=)
     # Sets <code>IRB.conf[:SAVE_HISTORY]</code> to the given +val+ and calls
     # #init_save_history with this context.
     #
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 54596)
+++ ruby_2_3/ChangeLog	(revision 54597)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Fri Apr 15 21:10:00 2016  SHIBATA Hiroshi  <hsbt@r...>
+
+	* lib/irb/ext/save-history.rb: Fix NoMethodError when method is not defined.
+
 Fri Apr 15 14:52:06 2016  Elliot Winkler  <elliot.winkler@g...>
 
 	* lib/forwardable.rb (def_instance_delegator) fix delegating to

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54596


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