diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-15 12:10:04 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-15 12:10:04 +0000 |
commit | 59d521ade472e31affb1b3e925343adb95c89dd8 (patch) | |
tree | 436528f05eef7676d46e5d70397b390e12dcd812 | |
parent | 6fe4aa6ed75908cab04f23a36619d04b19cf3466 (diff) |
merge revision(s) 54596:
* lib/irb/ext/save-history.rb: Fix NoMethodError when method is not defined.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | lib/irb/ext/save-history.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Fri Apr 15 21:10:00 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org> + + * lib/irb/ext/save-history.rb: Fix NoMethodError when method is not defined. + Fri Apr 15 14:52:06 2016 Elliot Winkler <elliot.winkler@gmail.com> * lib/forwardable.rb (def_instance_delegator) fix delegating to diff --git a/lib/irb/ext/save-history.rb b/lib/irb/ext/save-history.rb index d6e9be7415..ab64cf543d 100644 --- a/lib/irb/ext/save-history.rb +++ b/lib/irb/ext/save-history.rb @@ -27,7 +27,7 @@ module IRB 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. # @@ -1,6 +1,6 @@ #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 |