Insure message line is correct after startup script execution and command line arguments processed.

This commit is contained in:
Renaud 2015-01-23 22:13:21 +08:00
parent 7018880551
commit fe1eaf7348
1 changed files with 9 additions and 10 deletions

19
main.c
View File

@ -196,6 +196,9 @@ int main(int argc, char **argv)
cryptflag = FALSE; /* no encryption by default */
#endif
/* Insure screen is initialized before startup and goto/search */
update( FALSE) ;
/* Parse the command line */
for (carg = 1; carg < argc; ++carg) {
/* Process Switches */
@ -316,18 +319,14 @@ int main(int argc, char **argv)
bp->b_mode |= gmode;
/* Deal with startup gotos and searches */
if (gotoflag && searchflag) {
update(FALSE);
if( gotoflag && searchflag)
writestr( "(Can not search and goto at the same time!)") ;
} else if (gotoflag) {
if (gotoline(TRUE, gline) == FALSE) {
update(FALSE);
else if( gotoflag) {
if( gotoline( TRUE, gline) == FALSE)
writestr( "(Bogus goto argument)") ;
}
} else if (searchflag) {
if (forwhunt(FALSE, 0) == FALSE)
update(FALSE);
}
} else if( searchflag)
if( forwhunt( FALSE, 0))
writefmt( "Found on line %d", getcline()) ;
/* Setup to process commands. */
lastflag = 0; /* Fake last flags. */