summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--vm_method.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 94d96c4fe9..734a4fd9b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 26 18:36:43 2015 Shota Fukumori (sora_h) <her@sorah.jp>
+
+ * vm_method.c(rb_method_entry_make):
+ [DOC] [ci skip] Remove a needless space from comment
+ [Fixes GH-1069] Patch by @yui-knk
+
Mon Oct 26 17:30:13 2015 Ryan Hosford <tad.hosford@gmail.com>
* lib/fileutils.rb: rename tailing to trailing.
diff --git a/vm_method.c b/vm_method.c
index 923085f33c..f61c1b7d96 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -442,7 +442,7 @@ rb_add_refined_method_entry(VALUE refined_class, ID mid)
/*
* klass->method_table[mid] = method_entry(defined_class, visi, def)
*
- * If def is given (!= NULL), then just use it and ignore original_id and otps.
+ * If def is given (!= NULL), then just use it and ignore original_id and otps.
* If not given, then make a new def with original_id and opts.
*/
static rb_method_entry_t *