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

core/cpu/x86/64/64.factor

@@ -4,7 +4,7 @@ USING: alien.c-types arrays cpu.x86.assembler
 cpu.x86.architecture cpu.x86.intrinsics cpu.x86.sse2
 cpu.x86.allot cpu.architecture kernel kernel.private math
 namespaces sequences generator.registers generator.fixup system
-alien alien.accessors alien.compiler alien.structs slots
+layouts alien alien.accessors alien.compiler alien.structs slots
 splitting assocs ;
 IN: cpu.x86.64
 

extra/ui/cocoa/views/views.factor

@@ -297,7 +297,7 @@ CLASS: {
 { "updateFactorGadgetSize:" "void" { "id" "SEL" "id" }
     [
         [
-            2drop dup view-dim swap window set-gadget-dim
+            2drop dup view-dim swap window set-gadget-dim yield
         ] ui-try
     ]
 }

extra/ui/gestures/gestures.factor

@@ -119,7 +119,8 @@ SYMBOL: drag-timer
 
 : stop-drag-timer ( -- )
     hand-buttons get-global empty? [
-        drag-timer get-global box> cancel-alarm
+        drag-timer get-global ?box
+        [ cancel-alarm ] [ drop ] if
     ] when ;
 
 : fire-motion ( -- )

extra/ui/windows/windows.factor

@@ -340,7 +340,7 @@ H{ } clone wm-handlers set-global
 [ 4dup handle-wm-keydown DefWindowProc ] { WM_KEYDOWN WM_SYSKEYDOWN } add-wm-handler
 [ 4dup handle-wm-char DefWindowProc    ] { WM_CHAR WM_SYSCHAR }       add-wm-handler
 [ 4dup handle-wm-keyup DefWindowProc   ] { WM_KEYUP WM_SYSKEYUP }     add-wm-handler
-               
+
 [ handle-wm-syscommand   ] WM_SYSCOMMAND add-wm-handler
 [ handle-wm-set-focus 0  ] WM_SETFOCUS add-wm-handler
 [ handle-wm-kill-focus 0 ] WM_KILLFOCUS add-wm-handler