--- gforth/wf.fs	2006/03/19 23:27:38	1.45
+++ gforth/wf.fs	2006/10/08 11:30:56	1.48
@@ -43,7 +43,7 @@ require string.fs
 	case
 	    '& of  ." &"  endof
 	    '< of  ." &lt;"   endof
-\	    '¤ of  ." &euro;" endof
+\	    &164 of  ." &euro;" endof
 	    dup emit
 	endcase
     LOOP ;
@@ -68,7 +68,11 @@ s" " default-class $!
 : tagged ( addr1 u1 addr2 u2 -- )  2dup 2>r tag .type 2r> /tag ;
 
 : opt ( addr u opt u -- )  s"  " tag-option $+!
-    tag-option $+! s' ="' tag-option $+! tag-option $+!
+    tag-option $+! s' ="' tag-option $+!
+\    BEGIN  dup  WHILE  '& $split >r >r tag-option $+! r> r>
+\	    dup IF  s" %26" tag-option $+!  THEN
+\    REPEAT  2drop
+    tag-option $+!
     s' "' tag-option $+! ;
 : n>string ( n -- addr u )  0 <# #S #> ;
 : xy>string ( x y -- )  swap 0 <# #S 'x hold 2drop 0 #S 's hold #> ;
@@ -327,7 +331,7 @@ s" Gforth" environment? [IF] s" 0.5.0" s
 [ELSE]
 : parse-string ( addr u -- )
     evaluate-input cell new-tib #tib ! tib !
-    ['] parse-line catch pop-file throw ;
+    ['] parse-line catch pop-file rethrow ;
 [THEN] [THEN]
 
 Variable expand-link