From 9efe8fa520486fff7f97f2275a06543dbbfa5e79 Mon Sep 17 00:00:00 2001
From: Daniel Ehrenberg <littledan@Macintosh-103.local>
Date: Mon, 26 Jan 2009 21:39:08 -0600
Subject: [PATCH] Minor fixes for xml entities and interpolate

---
 basis/xml/entities/entities.factor       | 1 +
 basis/xml/interpolate/interpolate.factor | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/basis/xml/entities/entities.factor b/basis/xml/entities/entities.factor
index a730474f20..3e768b1b88 100644
--- a/basis/xml/entities/entities.factor
+++ b/basis/xml/entities/entities.factor
@@ -16,6 +16,7 @@ IN: xml.entities
         { CHAR: & "&amp;"  }
         { CHAR: ' "&apos;" }
         { CHAR: " "&quot;" }
+        { CHAR: < "&lt;"   }
     } ;
 
 : escape-string-by ( str table -- escaped )
diff --git a/basis/xml/interpolate/interpolate.factor b/basis/xml/interpolate/interpolate.factor
index 2334a5c3cc..f5e39da4ee 100644
--- a/basis/xml/interpolate/interpolate.factor
+++ b/basis/xml/interpolate/interpolate.factor
@@ -90,7 +90,7 @@ MACRO: interpolate-chunk ( string -- chunk )
 
 : parse-def ( accum delimiter word -- accum )
     [
-        parse-multiline-string
+        parse-multiline-string but-last
         [ string>chunk extract-variables collect ] keep
         parsed
     ] dip parsed ;