2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 08993ea365..303f226888 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 13 18:50:14 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_ensure): remove obsolete prot_tag comment.  patch by
+	  Jack Danger at [ruby-core:66238].  [misc #10502]
+
 Thu Nov 13 18:10:38 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* vm.c (rb_vm_make_proc_lambda): similar to rb_vm_make_proc() with
diff --git a/eval.c b/eval.c
index 3e4ea1697e..f8d82683bf 100644
--- a/eval.c
+++ b/eval.c
@@ -911,8 +911,6 @@ rb_ensure(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*e_proc)(ANYARGS), VALUE
 	result = (*b_proc) (data1);
     }
     POP_TAG();
-    /* TODO: fix me */
-    /* retval = prot_tag ? prot_tag->retval : Qnil; */     /* save retval */
     errinfo = th->errinfo;
     th->ensure_list=ensure_list.next;
     (*ensure_list.entry.e_proc)(ensure_list.entry.data2);