Merge git://factorcode.org/git/factor

diff --cc extra/ui/ui.factor
index 0baa4df65b67b123ff9c92afca223f42e84ac66d,96f7f8ed068d3db1f415560e93d963478f1c2685..774d84ff3d02dd27703ce30e03a6bd43093af022
--- 1/extra/ui/ui.factor
--- 2/extra/ui/ui.factor
+++ b/extra/ui/ui.factor
@@@ -120,11 -120,9 +120,11 @@@ SYMBOL: ui-hoo
      [ dup update-hand draw-world ] each ;
  
  : notify ( gadget -- )
 -    dup gadget-graft-state dup first { f f } { t t } ? pick set-gadget-graft-state {
 +    dup gadget-graft-state
 +    dup first { f f } { t t } ?
 +    pick set-gadget-graft-state {
          { { f t } [ dup activate-control graft* ] }
-         { { t f } [ dup activate-control ungraft* ] }
+         { { t f } [ dup deactivate-control ungraft* ] }
      } case ;
  
  : notify-queued ( -- )