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

Conflicts:

	extra/multiline/multiline.factor

diff --cc extra/multiline/multiline.factor
index 0ed72f6936afcc662be63a7fd225f502154c39ae,9a6d052b60d03f09b7148f305d5f7678aa3a2384..adf8863ae1fbbca5f9ff762084805aeb77a155e0
mode 100644,100755..100755
--- 1/extra/multiline/multiline.factor
--- 2/extra/multiline/multiline.factor
+++ b/extra/multiline/multiline.factor
@@@ -4,14 -4,11 +4,14 @@@ USING: namespaces parser kernel sequenc
  IN: multiline
  
  : next-line-text ( -- str )
-     lexer get dup next-line line-text ;
+     lexer get dup next-line lexer-line-text ;
  
  : (parse-here) ( -- )
 -    next-line-text dup ";" =
 -    [ drop lexer get next-line ] [ % "\n" % (parse-here) ] if ;
 +    next-line-text [
 +        dup ";" =
 +        [ drop lexer get next-line ]
 +        [ % "\n" % (parse-here) ] if
 +    ] [ ";" unexpected-eof ] if* ;
  
  : parse-here ( -- str )
      [ (parse-here) ] "" make 1 head*
@@@ -22,13 -19,11 +22,13 @@@
      parse-here 1quotation define ; parsing
  
  : (parse-multiline-string) ( start-index end-text -- end-index )
-     lexer get line-text [
 -    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 )
      [