* file.c (path_check_1): do not warn on world writable *parent*

  directories.

* class.c (rb_include_module): should preserve ancestor order in
  the included class/module.


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

1 files changed, 3 insertions, 1 deletions

diff --git a/class.c b/class.c
index 32ee98be72..12d03f15e4 100644
--- a/class.c
+++ b/class.c
@@ -361,8 +361,10 @@ rb_include_module(klass, module)
 	/* ignore if the module included already in superclasses */
 	for (p = RCLASS(klass)->super; p; p = RCLASS(p)->super) {
 	    if (BUILTIN_TYPE(p) == T_ICLASS) {
-		if (RCLASS(p)->m_tbl == RCLASS(module)->m_tbl)
+		if (RCLASS(p)->m_tbl == RCLASS(module)->m_tbl) {
+		    c = p;	/* move insertion point */
 		    goto skip;
+		}
 	    }
 	}
 	RCLASS(c)->super = include_class_new(module, RCLASS(c)->super);