From: Sam Anklesaria <sam@Tintin.local>
Date: Wed, 22 Jul 2009 15:02:09 +0000 (-0500)
Subject: Merge branch 'master' of git://factorcode.org/git/factor
X-Git-Tag: 0.97~5838^2~39
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=cc38d1ada6dc3125ddea9432187d6b0ceceee931

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
---

cc38d1ada6dc3125ddea9432187d6b0ceceee931
diff --cc basis/functors/functors.factor
index ccd1e9618e,5129515980..5f519aeece
--- a/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 c0b792785d,3beb0af79f..353dd91270
--- a/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 0bfb607a52,7ac0bd2e58..7ac0bd2e58
mode 100755,100644..100755
--- a/core/vocabs/parser/parser.factor
+++ b/core/vocabs/parser/parser.factor