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

Conflicts:

	extra/combinators/lib/lib.factor
	extra/io/windows/files/files.factor
	extra/opengl/demo-support/demo-support.factor
	extra/opengl/shaders/shaders.factor

diff --cc extra/bunny/outlined/outlined.factor
index 67617b02736c68bcb98ec13161233310921eaf35,012aa1fd783865a5ca716c97e7332b145d3abaf7..6295e3b9ded137815cbf6f1f1a6b61894d3f18aa
mode 100644,100755..100755
--- 1/extra/bunny/outlined/outlined.factor
--- 2/extra/bunny/outlined/outlined.factor
+++ b/extra/bunny/outlined/outlined.factor
@@@ -1,7 -1,7 +1,7 @@@
  USING: arrays bunny.model bunny.cel-shaded
 -combinators.lib continuations kernel math multiline
 +combinators.cleave continuations kernel math multiline
  opengl opengl.shaders opengl.framebuffers opengl.gl
- opengl.capabilities sequences ui.gadgets ;
+ opengl.capabilities sequences ui.gadgets combinators.cleave ;
  IN: bunny.outlined
  
  STRING: outlined-pass1-fragment-shader-main-source

diff --cc extra/combinators/lib/lib.factor
index c617466d1bba815b9561e3892cc6e4da23f4f769,7c93f805cd6175fadc55cc742d46387666b715bd..e177e33c15e807de0c18eec29399e6366814290c
--- 1/extra/combinators/lib/lib.factor
--- 2/extra/combinators/lib/lib.factor
+++ b/extra/combinators/lib/lib.factor
@@@ -130,14 -130,18 +130,21 @@@ MACRO: parallel-call ( quots -- 
  ! map-call and friends
  ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  
+ : (make-call-with) ( quots -- quot ) 
+     [ [ keep ] curry ] map concat [ drop ] append ;
+ 
  MACRO: map-call-with ( quots -- )
-     [ [ [ keep ] curry ] map concat [ drop ] append ] keep length [ narray ] curry compose ;
+     [ (make-call-with) ] keep length [ narray ] curry compose ;
+ 
+ : (make-call-with2) ( quots -- quot )
+     [ [ 2dup >r >r ] swap append [ r> r> ] append ] map concat
+     [ 2drop ] append ;
  
  MACRO: map-call-with2 ( quots -- )
 -    [ (make-call-with2) ] keep length [ narray ] curry append ;
 +    [
 +        [ [ 2dup >r >r ] swap append [ r> r> ] append ] map concat
 +        [ 2drop ] append    
 +    ] keep length [ narray ] curry append ;
  
  MACRO: map-exec-with ( words -- )
      [ 1quotation ] map [ map-call-with ] curry ;