summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-03 03:05:51 +0000
committerkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-03 03:05:51 +0000
commitbd950a75b512a7d6243d1f0bb5e944a06a2e1f94 (patch)
treedafdea9fd2e2111aa1ca4f1f860a64d2eb26544e
parent5e17a85cfe9b8ec72b7d914d68ffc2024e872c82 (diff)
* error.c: [DOC] Exception#cause may return nil. [ci skip]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--error.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ba8a70fa7b..d467d57919 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb 3 12:04:47 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * error.c: [DOC] Exception#cause may return nil. [ci skip]
+
Mon Feb 3 10:49:48 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (glob_helper): return the filename with actual cases on
diff --git a/error.c b/error.c
index 773d679e23..4c95fae484 100644
--- a/error.c
+++ b/error.c
@@ -806,7 +806,7 @@ rb_exc_set_backtrace(VALUE exc, VALUE bt)
/*
* call-seq:
- * exception.cause -> an_exception
+ * exception.cause -> an_exception or nil
*
* Returns the previous exception ($!) at the time this exception was raised.
* This is useful for wrapping exceptions and retaining the original exception