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

Conflicts:

	extra/delegate/delegate.factor

diff --cc extra/delegate/delegate.factor
index 8ca99ec5655fc772a22d7502b1f4b4a97f5a3b7b,eadd1a03e818b355cc32bcb8b1c69c0a0921d00c..fc62c290df8ff4deca59013fe0e683c20099b897
--- 1/extra/delegate/delegate.factor
--- 2/extra/delegate/delegate.factor
+++ b/extra/delegate/delegate.factor
@@@ -28,19 -27,10 +28,19 @@@ M: tuple-class group-word
      swap [ slot-spec-writer ] map append ;
  
  : define-consult-method ( word class quot -- )
-     pick add >r swap create-method-in r> define ;
+     pick suffix >r swap create-method r> define ;
  
 +: 3bi ( x y z p q -- p(x,y,z) q(x,y,z) )
 +    >r 3keep r> call ; inline
 +
 +: change-word-prop ( word prop quot -- )
 +    >r swap word-props r> change-at ; inline
 +
 +: declare-consult ( class group -- )
 +    "protocol-users" [ ?push ] change-word-prop ;
 +
  : define-consult ( class group quot -- )
 -    >r group-words swap r>
 +    >r 2dup declare-consult group-words swap r>
      [ define-consult-method ] 2curry each ;
  
  : CONSULT: