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

Conflicts:
	basis/functors/functors.factor
	basis/io/launcher/launcher.factor
	basis/ui/gadgets/tables/tables.factor

diff --cc basis/functors/functors.factor
index ccd1e9618ed7bed74f27db197db62cd9bbf7b21b,51295159807cd5441e72b737ed06612fea5e106a..5f519aeecefe41ad70e489bafe35c84d9f963859
--- 1/basis/functors/functors.factor
--- 2/basis/functors/functors.factor
+++ b/basis/functors/functors.factor
@@@ -1,11 -1,11 +1,11 @@@
  ! Copyright (C) 2008, 2009 Slava Pestov.
  ! See http://factorcode.org/license.txt for BSD license.
 -USING: accessors arrays classes.mixin classes.parser classes.singleton
 -classes.tuple classes.tuple.parser combinators effects effects.parser
 -fry generic generic.parser generic.standard interpolate
 -io.streams.string kernel lexer locals.parser locals.rewrite.closures
 -locals.types make namespaces parser quotations sequences vocabs.parser
 -words words.symbol ;
 +USING: accessors arrays classes.mixin classes.parser
- classes.tuple classes.tuple.parser combinators effects
- effects.parser fry generic generic.parser generic.standard
- interpolate io.streams.string kernel lexer locals.parser
- locals.rewrite.closures locals.types make macros namespaces
- parser quotations sequences vocabs.parser words words.symbol ;
++classes.singleton classes.tuple classes.tuple.parser
++combinators effects.parser fry generic generic.parser
++generic.standard interpolate io.streams.string kernel lexer
++locals.parser locals.types macros make namespaces parser
++quotations sequences vocabs.parser words words.symbol ;
  IN: functors
  
  ! This is a hack

diff --cc basis/ui/gadgets/tables/tables.factor
index c0b792785dc75f729ab7e4b5a96e741701b7f52e,3beb0af79f946a75cbe630b046a982005c725a2a..353dd912701ee825e2d2a282bb61e2814b533e13
--- 1/basis/ui/gadgets/tables/tables.factor
--- 2/basis/ui/gadgets/tables/tables.factor
+++ b/basis/ui/gadgets/tables/tables.factor
@@@ -360,7 -318,9 +359,9 @@@ PRIVATE
  <PRIVATE
  
  : table-button-up ( table -- )
-     dup row-action? [ row-action ] [ update-selected-values ] if ;
+     dup [ mouse-row ] keep valid-line? [
 -        dup row-action? [ row-action ] [ update-selected-value ] if
++        dup row-action? [ row-action ] [ update-selected-values ] if
+     ] [ drop ] if ;
  
  PRIVATE>
  

diff --cc core/vocabs/parser/parser.factor
index 0bfb607a52f67c33a95374405b96851684e35ac3,7ac0bd2e58fd6b1298da969a847f5d9a8c9d7269..7ac0bd2e58fd6b1298da969a847f5d9a8c9d7269
mode 100755,100644..100755
--- 1/core/vocabs/parser/parser.factor
--- 2/core/vocabs/parser/parser.factor
+++ b/core/vocabs/parser/parser.factor