help: ensure the help lines are always drawn, also when using Slang

This is needed when --enable-tiny and --with-slang are used together
with --enable-help.
master
Benno Schulenberg 2020-09-11 18:49:54 +02:00
parent b9a1a586c0
commit ba47abb473
1 changed files with 3 additions and 6 deletions

View File

@ -435,8 +435,6 @@ void show_help(void)
location = 0; location = 0;
didfind = 0; didfind = 0;
bottombars(MHELP);
/* Extract the title from the head of the help text. */ /* Extract the title from the head of the help text. */
length = break_line(help_text, HIGHEST_POSITIVE, TRUE); length = break_line(help_text, HIGHEST_POSITIVE, TRUE);
title = measured_copy(help_text, length); title = measured_copy(help_text, length);
@ -455,6 +453,8 @@ void show_help(void)
lastmessage = VACUUM; lastmessage = VACUUM;
focusing = TRUE; focusing = TRUE;
bottombars(MHELP);
/* Show the cursor when we searched and found something. */ /* Show the cursor when we searched and found something. */
kbinput = get_kbinput(edit, didfind == 1 || ISSET(SHOW_CURSOR)); kbinput = get_kbinput(edit, didfind == 1 || ISSET(SHOW_CURSOR));
didfind = 0; didfind = 0;
@ -480,11 +480,9 @@ void show_help(void)
do_scroll_down(); do_scroll_down();
} else if (func == do_page_up || func == do_page_down || } else if (func == do_page_up || func == do_page_down ||
func == to_first_line || func == to_last_line || func == to_first_line || func == to_last_line ||
func == do_search_forward || func == do_search_backward ||
func == do_findprevious || func == do_findnext) { func == do_findprevious || func == do_findnext) {
func(); func();
} else if (func == do_search_forward || func == do_search_backward) {
func();
bottombars(MHELP);
#ifdef ENABLE_NANORC #ifdef ENABLE_NANORC
} else if (func == (functionptrtype)implant) { } else if (func == (functionptrtype)implant) {
implant(first_sc_for(MHELP, func)->expansion); implant(first_sc_for(MHELP, func)->expansion);
@ -503,7 +501,6 @@ void show_help(void)
} else } else
unbound_key(kbinput); unbound_key(kbinput);
currmenu = MHELP;
edit_refresh(); edit_refresh();
location = 0; location = 0;