ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minibar: stay out of sight when the terminal has just one row 

When there is just one row, the user wants to see text on this row,
not a bar with some meta info.

This fixes https://savannah.gnu.org/bugs/?60508.

Bug existed since version 5.5, since the minibar was introduced
with commit d31cc373.
master
Benno Schulenberg 2021-05-03 15:47:37 +02:00
parent 02df950240
commit eb3cc3a32d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/files.c
View File

@ -2004,7 +2004,7 @@ bool write_file(const char *name, FILE *thefile, bool tmp,
}
#ifndef NANO_TINY
if (ISSET(MINIBAR) && fullbuffer && !tmp)
if (ISSET(MINIBAR) && LINES > 1 && fullbuffer && !tmp)
report_size = TRUE;
else
#endif

2
src/nano.c
View File

@ -2501,7 +2501,7 @@ int main(int argc, char **argv)
bottombars(MMAIN);
#ifndef NANO_TINY
if (ISSET(MINIBAR) && lastmessage < REMARK)
if (ISSET(MINIBAR) && LINES > 1 && lastmessage < REMARK)
minibar();
else
#endif

2
src/winio.c
View File

@ -189,7 +189,7 @@ void read_keys_from(WINDOW *win)
curs_set(1);
#ifndef NANO_TINY
if (currmenu == MMAIN && ISSET(MINIBAR) && lastmessage > HUSH &&
if (currmenu == MMAIN && ISSET(MINIBAR) && LINES > 1 && lastmessage > HUSH &&
lastmessage != INFO && lastmessage < ALERT) {
timed = TRUE;
halfdelay(ISSET(QUICK_BLANK) ? 8 : 15);