summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--lib/irb/ext/save-history.rb2
-rw-r--r--version.h2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a1be9620d..28f55f2ec2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
#
diff --git a/version.h b/version.h
index 6d12a8698d..4f3f4e3111 100644
--- a/version.h
+++ b/version.h
@@ -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