Merge branch 'master' of git://factorcode.org/git/factor

basis/bootstrap/image/image.factor

@@ -26,7 +26,6 @@ IN: bootstrap.image
         "x86.32"
         "x86.64"
         "linux-ppc" "macosx-ppc"
-        ! "arm"
     } ;
 
 <PRIVATE
@@ -412,14 +411,14 @@ M: quotation '
     all-words [ emit-word ] each ;
 
 : emit-global ( -- )
-    [
-        {
-            dictionary source-files builtins
-            update-map implementors-map class<=-cache
-            class-not-cache classes-intersect-cache class-and-cache
-            class-or-cache
-        } [ dup get swap bootstrap-word set ] each
-    ] H{ } make-assoc
+    {
+        dictionary source-files builtins
+        update-map implementors-map
+    } [ [ bootstrap-word ] [ get ] bi ] H{ } map>assoc
+    {
+        class<=-cache class-not-cache classes-intersect-cache
+        class-and-cache class-or-cache
+    } [ H{ } clone ] H{ } map>assoc assoc-union
     bootstrap-global set
     bootstrap-global emit-userenv ;
 

core/io/files/files.factor

@@ -192,11 +192,13 @@ PRIVATE>
 
 SYMBOL: current-directory
 
-[ cwd current-directory set-global ] "io.files" add-init-hook
+[
+    cwd current-directory set-global
+    image parent-directory cwd prepend-path "resource-path" set
+] "io.files" add-init-hook
 
 : resource-path ( path -- newpath )
-    "resource-path" get [ image parent-directory ] unless*
-    prepend-path ;
+    "resource-path" get prepend-path ;
 
 : (normalize-path) ( path -- path' )
     "resource:" ?head [