From: Daniel Ehrenberg <littledan@Macintosh-122.local>
Date: Mon, 23 Feb 2009 19:10:54 +0000 (-0600)
Subject: Merge branch 'master' of git://factorcode.org/git/factor into regexp
X-Git-Tag: 0.94~2191^2~64^2~23
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=e54727f9bf1cdad87cfc7a36316ae045cf50cb59

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

e54727f9bf1cdad87cfc7a36316ae045cf50cb59
diff --cc core/assocs/assocs.factor
index f2a04dc01b,fdaa02e6c4..35e7535aa7
--- a/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>