tweaks: elide a variable that is confusing and has just one use case

master
Benno Schulenberg 2021-11-22 12:03:28 +01:00
parent addac49465
commit 9c9de85afb
6 changed files with 2 additions and 8 deletions

View File

@ -80,8 +80,6 @@ linestruct *pletion_line = NULL;
bool also_the_last = FALSE;
/* Whether indenting/commenting should include the last line of
* the marked region. */
bool hide_cursor = FALSE;
/* Whether to suppress the cursor when highlighting a search match. */
char *answer = NULL;
/* The answer string used by the status-bar prompt. */

View File

@ -469,7 +469,6 @@ void show_help(void)
#ifndef NANO_TINY
spotlighted = FALSE;
hide_cursor = FALSE;
if (bracketed_paste || kbinput == BRACKETED_PASTE_MARKER) {
beep();

View File

@ -1531,7 +1531,6 @@ void process_a_keystroke(void)
input = get_kbinput(edit, VISIBLE);
lastmessage = VACUUM;
hide_cursor = FALSE;
#ifndef NANO_TINY
if (input == KEY_WINCH)

View File

@ -53,7 +53,6 @@ extern message_type lastmessage;
extern linestruct *pletion_line;
extern bool also_the_last;
extern bool hide_cursor;
extern char *answer;

View File

@ -327,8 +327,6 @@ int findnextstr(const char *needle, bool whole_word_only, int modus,
spotlighted = TRUE;
light_from_col = xplustabs();
light_to_col = wideness(line->data, found_x + found_len);
if (!ISSET(SHOW_CURSOR))
hide_cursor = TRUE;
edit_refresh();
}
#endif

View File

@ -189,7 +189,8 @@ void read_keys_from(WINDOW *win)
/* Before reading the first keycode, display any pending screen updates. */
doupdate();
if (reveal_cursor && !hide_cursor && (LINES > 1 || lastmessage <= HUSH))
if (reveal_cursor && (!spotlighted || ISSET(SHOW_CURSOR || currmenu == MSPELL)) &&
(LINES > 1 || lastmessage <= HUSH))
curs_set(1);
#ifndef NANO_TINY