merges r20839 from trunk into ruby_1_9_1.

* array.c (rb_ary_pop_m): use enum ary_take_pos_flags.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20871 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index b5d27fa291..cebb78c287 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 17 15:44:28 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* array.c (rb_ary_pop_m): use enum ary_take_pos_flags.
+
 Wed Dec 17 15:22:45 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* configure.in (OBJDUMP, OBJCOPY): 
diff --git a/array.c b/array.c
index 578f7fae90..535cfd0605 100644
--- a/array.c
+++ b/array.c
@@ -743,7 +743,7 @@ rb_ary_pop_m(int argc, VALUE *argv, VALUE ary)
     }
 
     rb_ary_modify_check(ary);
-    result = ary_take_first_or_last(argc, argv, ary, Qtrue);
+    result = ary_take_first_or_last(argc, argv, ary, ARY_TAKE_LAST);
     ARY_INCREASE_LEN(ary, -RARRAY_LEN(result));
     return result;
 }