Merge branch 'master' of git.sv.gnu.org:/srv/git/gforth

Author: AntonErtl

minos2/md-viewer.fs

@@ -253,13 +253,13 @@ previous
     fn$ @ album-imgs[] >stack
     1 imgs# +! ;
 
+66 Value maxcols#
+
 : wh>glue ( w h w% h% o:glue -- ) { f: w% f: h% }
     2dup dpy-h @ s>f fm/ h% f* dpy-w @ s>f fm/ w% f* fmin
     \ not bigger than x% of screen
     fdup fm* vglue-c df!  fm* hglue-c df! ;
 
-66 Value maxcols#
-
 : default-imgwh% ( -- w h )
     dpy-w @ s>f font-size# maxcols# fm* f/ 1/f 100% fmin 100% ;
 

minos2/widgets.fs

@@ -1108,7 +1108,7 @@ glue*2 >o 1glue f2* hglue-c glue! 0glue f2* dglue-c glue! 1glue f2* vglue-c glue
     hbox new { newbox }
     act ?dup-IF  .clone newbox .!act  THEN
     childs# start floor f>s U+DO
-	firstflag newbox .childs[] $[]# 0<> or
+	firstflag newbox .childs[] $[]# 0= and
 	startx rw I childs[] $[] @ .split to startx
 	0e { f: ow }
 	?dup-IF

tokenize.fs

@@ -132,8 +132,8 @@ Variable recursive?
 		over ?token IF  2 emit xemit
 		ELSE  1 i,  THEN
 	    THEN
-	    nextname-string 2@ d0<> IF
-		9 emit nextname-string 2@ dup xemit type
+	    nextname$ $@ d0<> IF
+		9 emit nextname$ $@ dup xemit type
 	    THEN
 	endof
 	rectype-num of