Merge branch 'master' into microseconds

diff --cc basis/bootstrap/stage2.factor
Simple merge

diff --cc basis/concurrency/combinators/combinators-tests.factor
Simple merge

diff --cc basis/io/unix/files/files.factor
Simple merge

diff --cc basis/smtp/smtp.factor
Simple merge

diff --cc basis/stack-checker/known-words/known-words.factor
Simple merge

diff --cc basis/ui/gestures/gestures-docs.factor
Simple merge

diff --cc basis/ui/gestures/gestures.factor
Simple merge

diff --cc basis/ui/ui.factor
index dc868154bb3958b0048a01bc46586e724bb04db7,e05341f3fc97df29102acd976f4fe4adae4aa880..de2eb713072989a25b8af0c592c0415df46ba51d
--- 1/basis/ui/ui.factor
--- 2/basis/ui/ui.factor
+++ b/basis/ui/ui.factor
@@@ -138,14 -139,22 +139,22 @@@ SYMBOL: ui-hoo
  : notify-queued ( -- )
      graft-queue [ notify ] slurp-deque ;
  
+ : send-queued-gestures ( -- )
+     gesture-queue [ send-queued-gesture ] slurp-deque ;
+ 
  : update-ui ( -- )
-     [ notify-queued layout-queued redraw-worlds ] assert-depth ;
+     [
+         [
+             notify-queued
+             layout-queued
+             redraw-worlds
+             send-queued-gestures
+         ] assert-depth
+     ] [ ui-error ] recover ;
  
  : ui-wait ( -- )
 -    10 sleep ;
 +    10 milliseconds sleep ;
  
- : ui-try ( quot -- ) [ ui-error ] recover ;
- 
  SYMBOL: ui-thread
  
  : ui-running ( quot -- )

diff --cc core/bootstrap/primitives.factor
Simple merge

diff --cc core/io/streams/c/c.factor
index 287ee3ad952c74e7453ac9e1f8ae212c78ab5641,dd7f3226cb318bd7915630ff45d353ae86a14f6a..47e19d2c40360e1b56f3dfcd62ee6d7940b0daa7
mode 100644,100755..100755
--- 1/core/io/streams/c/c.factor
--- 2/core/io/streams/c/c.factor
+++ b/core/io/streams/c/c.factor

diff --cc vm/run.c
Simple merge

diff --cc vm/run.h
Simple merge