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

feedback: report the number of inserted lines also with --zero or --mini 

Inserting another file is somewhat unusual -- it's better to give
feedback about it.

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

Bug existed since version 5.5, since the minibar was introduced.
master
Benno Schulenberg 2021-11-19 17:02:21 +01:00
parent 51a5f33b5b
commit 9d3d354bd4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/files.c
View File

@ -819,10 +819,12 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
"Read %zu lines (Converted from DOS format)", "Read %zu lines (Converted from DOS format)",
num_lines), num_lines); num_lines), num_lines);
#endif #endif
else if (!ISSET(ZERO)) else if ((!ISSET(MINIBAR) && !ISSET(ZERO)) || we_are_running)
statusline(HUSH, P_("Read %zu line", "Read %zu lines", statusline(REMARK, P_("Read %zu line", "Read %zu lines",
num_lines), num_lines); num_lines), num_lines);
report_size = TRUE;
/* If we inserted less than a screenful, don't center the cursor. */ /* If we inserted less than a screenful, don't center the cursor. */
if (undoable && less_than_a_screenful(was_lineno, was_leftedge)) if (undoable && less_than_a_screenful(was_lineno, was_leftedge))
focusing = FALSE; focusing = FALSE;
@ -898,7 +900,7 @@ int open_file(const char *filename, bool new_one, FILE **f)
statusline(ALERT, _("Error reading %s: %s"), filename, strerror(errno)); statusline(ALERT, _("Error reading %s: %s"), filename, strerror(errno));
close(fd); close(fd);
fd = -1; fd = -1;
} else if (!ISSET(ZERO)) } else if (!ISSET(ZERO) || we_are_running)
statusbar(_("Reading...")); statusbar(_("Reading..."));
} }