From: Daniel Ehrenberg <ehrenbed@carleton.edu>
Date: Mon, 10 Mar 2008 03:04:19 +0000 (-0500)
Subject: Merge branch 'master' of git://factorcode.org/git/factor into unicode
X-Git-Tag: 0.94~3738^2~114
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=862dd0b5cb1814cdda5821c116c9396904c7fde0

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

Conflicts:

	extra/io/encodings/ascii/ascii.factor
	extra/io/encodings/latin1/latin1.factor
---

862dd0b5cb1814cdda5821c116c9396904c7fde0
diff --cc extra/io/encodings/latin1/latin1.factor
index ec01da5983,3cb361b2fd..71e98a1747
--- a/extra/io/encodings/latin1/latin1.factor
+++ b/extra/io/encodings/latin1/latin1.factor
@@@ -6,4 -6,7 +6,7 @@@ IN: io.encodings.latin
  TUPLE: latin1 ;
  
  M: latin1 stream-write-encoded 
 -    drop 256 encode-check<= ;
 +    drop 256 encode-check< ;
+ 
+ M: latin1 decode-step
+     drop swap push ;