From 59187b8051b95575caf454ce1bd141b1115f3e94 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Thu, 28 May 2015 13:28:37 +0000 Subject: [PATCH] Normalizing the whitespace after the recent changes in logic. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5229 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 4 ++++ src/help.c | 19 ++++++++-------- src/prompt.c | 62 ++++++++++++++++++++++++++-------------------------- 3 files changed, 45 insertions(+), 40 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b1133da..77bc452f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-05-28 Benno Schulenberg + * src/help.c (do_help), src/prompt.c (do_yesno_prompt): Normalize + the whitespace after the recent changes in logic. + 2015-05-28 Mahyar Abbaspour * src/nano.c (handle_sigwinch, regenerate_screen), src/global.c, src/prompt.c (do_statusbar_input, get_prompt_string, do_yesno_prompt), diff --git a/src/help.c b/src/help.c index c6821a43..2ad5bce6 100644 --- a/src/help.c +++ b/src/help.c @@ -75,16 +75,17 @@ void do_help(void (*refresh_func)(void)) while (TRUE) { size_t i; - /* Get the last line of the help text. */ - ptr = help_text; + /* Get the last line of the help text. */ + ptr = help_text; - for (last_line = 0; *ptr != '\0'; last_line++) { - ptr += help_line_len(ptr); - if (*ptr == '\n') - ptr++; - } - if (last_line > 0) - last_line--; + for (last_line = 0; *ptr != '\0'; last_line++) { + ptr += help_line_len(ptr); + if (*ptr == '\n') + ptr++; + } + + if (last_line > 0) + last_line--; /* Display the help text if we don't have a key, or if the help * text has moved. */ diff --git a/src/prompt.c b/src/prompt.c index aa5ddafd..4766eb76 100644 --- a/src/prompt.c +++ b/src/prompt.c @@ -1075,48 +1075,48 @@ int do_yesno_prompt(bool all, const char *msg) int mouse_x, mouse_y; #endif - if (!ISSET(NO_HELP)) { - char shortstr[3]; + if (!ISSET(NO_HELP)) { + char shortstr[3]; /* Temp string for Yes, No, All. */ - if (COLS < 32) - width = COLS / 2; + if (COLS < 32) + width = COLS / 2; - /* Clear the shortcut list from the bottom of the screen. */ - blank_bottombars(); + /* Clear the shortcut list from the bottom of the screen. */ + blank_bottombars(); - sprintf(shortstr, " %c", yesstr[0]); - wmove(bottomwin, 1, 0); - onekey(shortstr, _("Yes"), width); + /* Now show the ones for "Yes", "No", "Cancel" and maybe "All". */ + sprintf(shortstr, " %c", yesstr[0]); + wmove(bottomwin, 1, 0); + onekey(shortstr, _("Yes"), width); - if (all) { - wmove(bottomwin, 1, width); - shortstr[1] = allstr[0]; - onekey(shortstr, _("All"), width); - } + if (all) { + wmove(bottomwin, 1, width); + shortstr[1] = allstr[0]; + onekey(shortstr, _("All"), width); + } - wmove(bottomwin, 2, 0); - shortstr[1] = nostr[0]; - onekey(shortstr, _("No"), width); + wmove(bottomwin, 2, 0); + shortstr[1] = nostr[0]; + onekey(shortstr, _("No"), width); - wmove(bottomwin, 2, 16); - onekey("^C", _("Cancel"), width); - } + wmove(bottomwin, 2, 16); + onekey("^C", _("Cancel"), width); + } - if (interface_color_pair[TITLE_BAR].bright) - wattron(bottomwin, A_BOLD); - wattron(bottomwin, interface_color_pair[TITLE_BAR].pairnum); + if (interface_color_pair[TITLE_BAR].bright) + wattron(bottomwin, A_BOLD); + wattron(bottomwin, interface_color_pair[TITLE_BAR].pairnum); - blank_statusbar(); - mvwaddnstr(bottomwin, 0, 0, msg, actual_x(msg, COLS - 1)); + blank_statusbar(); + mvwaddnstr(bottomwin, 0, 0, msg, actual_x(msg, COLS - 1)); - wattroff(bottomwin, A_BOLD); - wattroff(bottomwin, interface_color_pair[TITLE_BAR].pairnum); + wattroff(bottomwin, A_BOLD); + wattroff(bottomwin, interface_color_pair[TITLE_BAR].pairnum); - /* Refresh the edit window and the statusbar before getting - * input. */ - wnoutrefresh(edit); - wnoutrefresh(bottomwin); + /* Refresh edit window and statusbar before getting input. */ + wnoutrefresh(edit); + wnoutrefresh(bottomwin); currmenu = MYESNO; kbinput = get_kbinput(bottomwin); -- 2.39.5