diff --git a/ChangeLog b/ChangeLog index 879c0ba462d77441a3582b94d57d19408414a680..adc53d9e1b8a86aa25bb5d86a6f8e8fbddaa3f2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -390,6 +390,8 @@ CVS code - do_replace_highlight() - Use waddch() instead of waddstr() to display a space when we have a zero-length regex. (DLR) + - Rename variable highlight_flag to highlight, for consistency. + (DLR) do_credits() - Save the keystroke that breaks us out of the credits (if any) and put it back so that it isn't lost. This is especially diff --git a/src/proto.h b/src/proto.h index f584d46abab44918ae2c0d40f9c8cc7adea4da03..33c26f4bb8709b44281f1a7cfb8bf16fde49c67d 100644 --- a/src/proto.h +++ b/src/proto.h @@ -701,7 +701,7 @@ void do_cursorpos_void(void); size_t help_line_len(const char *ptr); void do_help(void); #endif -void do_replace_highlight(bool highlight_flag, const char *word); +void do_replace_highlight(bool highlight, const char *word); #ifndef NDEBUG int check_linenumbers(const filestruct *fileptr); #endif diff --git a/src/winio.c b/src/winio.c index ee3dea597a071b1b95cfd5b7c267d52589c2b032..fd50cb1f0877996ec098cb1f6b5bcac774e4d9c4 100644 --- a/src/winio.c +++ b/src/winio.c @@ -3982,7 +3982,7 @@ void do_help(void) /* Highlight the current word being replaced or spell checked. We * expect word to have tabs and control characters expanded. */ -void do_replace_highlight(bool highlight_flag, const char *word) +void do_replace_highlight(bool highlight, const char *word) { size_t y = xplustabs(), word_len = strlenpt(word); @@ -3997,7 +3997,7 @@ void do_replace_highlight(bool highlight_flag, const char *word) reset_cursor(); - if (highlight_flag) + if (highlight) wattron(edit, A_REVERSE); #ifdef HAVE_REGEX_H @@ -4011,7 +4011,7 @@ void do_replace_highlight(bool highlight_flag, const char *word) if (word_len > y) waddch(edit, '$'); - if (highlight_flag) + if (highlight) wattroff(edit, A_REVERSE); }