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

Conflicts:

	extra/bunny/bunny.factor
	extra/opengl/demo-support/demo-support.factor

diff --cc extra/bunny/bunny.factor
index 5c2404ec8400e8742f8afb5d868014b3b8ad4c6e,ae34923c64353ac745b9d2d549bace7422e88e5d..d546f9ea41c229a136732ca8fc8e7b70c6d86662
--- 1/extra/bunny/bunny.factor
--- 2/extra/bunny/bunny.factor
+++ b/extra/bunny/bunny.factor
@@@ -28,18 -28,23 +28,18 @@@ TUPLE: bunny-gadget model geom draw-se
  
  M: bunny-gadget graft* ( gadget -- )
      GL_DEPTH_TEST glEnable
 -    dup bunny-gadget-model <bunny-geom>
 -    over {
 -        [ <bunny-fixed-pipeline> ]
 -        [ <bunny-cel-shaded> ]
 -        [ <bunny-outlined> ]
 -    } map-call-with [ ] filter
 -    0
 -    roll {
 -        set-bunny-gadget-geom
 -        set-bunny-gadget-draw-seq
 -        set-bunny-gadget-draw-n
 -    } set-slots ;
 +    dup model>> <bunny-geom> >>geom
 +    dup
 +    [ <bunny-fixed-pipeline> ]
 +    [ <bunny-cel-shaded> ]
 +    [ <bunny-outlined> ] tri 3array
-     [ ] subset >>draw-seq
++    [ ] filter >>draw-seq
 +    0 >>draw-n
 +    drop ;
  
  M: bunny-gadget ungraft* ( gadget -- )
 -    { bunny-gadget-geom bunny-gadget-draw-seq } get-slots
 -    [ [ dispose ] when* ] each
 -    [ dispose ] when* ;
 +    [ geom>> [ dispose ] when* ]
 +    [ draw-seq>> [ [ dispose ] when* ] each ] bi ;
  
  M: bunny-gadget draw-gadget* ( gadget -- )
      0.15 0.15 0.15 1.0 glClearColor

diff --cc extra/bunny/model/model.factor
Simple merge

diff --cc extra/opengl/demo-support/demo-support.factor
index adc30e6f0ffc35ac5a0d457afdb6fdd62e1637a6,460558db8b73050215d1e8cfcf3904946e21c0d3..e98dcbce32452468921c5a5bb6b7e2343d2386a2
--- 1/extra/opengl/demo-support/demo-support.factor
--- 2/extra/opengl/demo-support/demo-support.factor
+++ b/extra/opengl/demo-support/demo-support.factor
@@@ -1,10 -1,18 +1,11 @@@
- USING: arrays combinators.lib kernel math math.functions math.vectors namespaces
-        opengl opengl.gl sequences ui ui.gadgets ui.gestures ui.render accessors ;
+ USING: arrays combinators.lib kernel math math.functions
+ math.order math.vectors namespaces opengl opengl.gl sequences ui
+ ui.gadgets ui.gestures ui.render ;
  IN: opengl.demo-support
  
 -: NEAR-PLANE 1.0 64.0 / ; inline
 -: FAR-PLANE 4.0 ; inline
  : FOV 2.0 sqrt 1+ ; inline
  : MOUSE-MOTION-SCALE 0.5 ; inline
 -: MOUSE-DISTANCE-SCALE 1.0 64.0 / ; inline
  : KEY-ROTATE-STEP 1.0 ; inline
 -: KEY-DISTANCE-STEP 1.0 64.0 / ; inline
 -: DIMS { 640 480 } ; inline
 -
 -: FOV-RATIO ( -- fov ) DIMS dup first2 min v/n ;
  
  SYMBOL: last-drag-loc
  

diff --cc extra/windows/com/syntax/syntax.factor
Simple merge