mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Using 'width' instead of hardcoded 16. And doing things in the same order 

for all three cases: setting the string and then positioning the cursor.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5230 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Benno Schulenberg 2015-05-28 13:51:03 +00:00
parent 59187b8051
commit 2661d6d397
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,6 +1,8 @@
2015-05-28 Benno Schulenberg <bensberg@justemail.net> 2015-05-28 Benno Schulenberg <bensberg@justemail.net>
* src/help.c (do_help), src/prompt.c (do_yesno_prompt): Normalize * src/help.c (do_help), src/prompt.c (do_yesno_prompt): Normalize
the whitespace after the recent changes in logic. the whitespace after the recent changes in logic.
* src/prompt.c (do_yesno_prompt): Use 'width' instead of hardcoded
16. Also always first set the string and then position the cursor.
2015-05-28 Mahyar Abbaspour <mahyar.abaspour@gmail.com> 2015-05-28 Mahyar Abbaspour <mahyar.abaspour@gmail.com>
* src/nano.c (handle_sigwinch, regenerate_screen), src/global.c, * src/nano.c (handle_sigwinch, regenerate_screen), src/global.c,

8
src/prompt.c
View File

@ -1077,7 +1077,7 @@ int do_yesno_prompt(bool all, const char *msg)
if (!ISSET(NO_HELP)) { if (!ISSET(NO_HELP)) {
char shortstr[3]; char shortstr[3];
/* Temp string for Yes, No, All. */ /* Temporary string for (translated) " Y", " N" and " A". */
if (COLS < 32) if (COLS < 32)
width = COLS / 2; width = COLS / 2;
@ -1091,16 +1091,16 @@ int do_yesno_prompt(bool all, const char *msg)
onekey(shortstr, _("Yes"), width); onekey(shortstr, _("Yes"), width);
if (all) { if (all) {
wmove(bottomwin, 1, width);
shortstr[1] = allstr[0]; shortstr[1] = allstr[0];
wmove(bottomwin, 1, width);
onekey(shortstr, _("All"), width); onekey(shortstr, _("All"), width);
} }
wmove(bottomwin, 2, 0);
shortstr[1] = nostr[0]; shortstr[1] = nostr[0];
wmove(bottomwin, 2, 0);
onekey(shortstr, _("No"), width); onekey(shortstr, _("No"), width);
wmove(bottomwin, 2, 16); wmove(bottomwin, 2, width);
onekey("^C", _("Cancel"), width); onekey("^C", _("Cancel"), width);
} }