This commit is contained in:
rsc 2004-04-19 19:35:17 +00:00
parent c2a9c3bb4e
commit aa8086853b
13 changed files with 98 additions and 63 deletions

View file

@ -191,9 +191,10 @@ usage(void)
void
threadmain(int argc, char *argv[])
{
char *p;
char *p, *font;
rfork(RFNOTEG);
font = nil;
_wantfocuschanges = 1;
mainpid = getpid();
ARGBEGIN{
@ -202,6 +203,9 @@ threadmain(int argc, char *argv[])
case 'a': /* acme mode */
button2exec++;
break;
case 'f':
font = EARGF(usage());
break;
case 's':
scrolling++;
break;
@ -210,6 +214,9 @@ threadmain(int argc, char *argv[])
break;
}ARGEND
if(font)
putenv("font", font);
p = getenv("tabstop");
if(p == 0)
p = getenv("TABSTOP");
@ -607,9 +614,9 @@ domenu2(int but)
else
menu2str[Scroll] = "☐ scroll";
if(cooked)
menu2str[Cooked] = "cooked";
menu2str[Cooked] = "mustecho";
else
menu2str[Cooked] = "cooked";
menu2str[Cooked] = "mustecho";
switch(menuhit(but, mc, &menu2, nil)){
case -1: