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

diff --cc extra/multiline/multiline.factor
index 4d777605cff9ace91f159833d20bfbc13e2a3d80,adf8863ae1fbbca5f9ff762084805aeb77a155e0..d32c11dd06ced1c87fbba785a4b53cc956ae2cea
--- 1/extra/multiline/multiline.factor
--- 2/extra/multiline/multiline.factor
+++ b/extra/multiline/multiline.factor
@@@ -16,14 -19,16 +19,16 @@@ IN: multilin
  
  : STRING:
      CREATE dup reset-generic
 -    parse-here 1quotation define ; parsing
 +    parse-here 1quotation define-inline ; parsing
  
  : (parse-multiline-string) ( start-index end-text -- end-index )
-     lexer get lexer-line-text 2dup start
-     [ rot dupd >r >r swap subseq % r> r> length + ] [
-         rot tail % "\n" % 0
-         lexer get next-line swap (parse-multiline-string)
-     ] if* ;
+     lexer get lexer-line-text [
+         2dup start
+         [ rot dupd >r >r swap subseq % r> r> length + ] [
+             rot tail % "\n" % 0
+             lexer get next-line swap (parse-multiline-string)
+         ] if*
+     ] [ nip unexpected-eof ] if* ;
  
  : parse-multiline-string ( end-text -- str )
      [