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

diff --cc core/assocs/assocs.factor
index f2a04dc01b2dc183ab200e1a7c64bedf1a317d13,fdaa02e6c42cd4e8815cdc3181271f0de49f63d3..35e7535aa71f33007d651bbc0fbc06feac6fdd27
--- 1/core/assocs/assocs.factor
--- 2/core/assocs/assocs.factor
+++ b/core/assocs/assocs.factor
@@@ -36,9 -39,9 +39,9 @@@ M: assoc assoc-like drop 
      [ first = ] with find swap ; inline
  
  : substituter ( assoc -- quot )
-     [ dupd at* [ nip ] [ drop ] if ] curry ; inline
+     [ ?at drop ] curry ; inline
  
 -: with-assoc ( assoc quot: ( value key -- assoc ) -- quot: ( key value -- ) )
 +: with-assoc ( assoc quot: ( value key assoc -- ) -- quot: ( key value -- ) )
      curry [ swap ] prepose ; inline
  
  PRIVATE>