ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix spurious warning message in do_gotoline() that was introduced when 

it was overhauled, and also fix some indentation in statusq()


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1990 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2004-10-15 01:39:46 +00:00
parent 4e8e495301
commit 1f204c0204
2 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/search.c
View File

@ -924,9 +924,11 @@ void do_gotoline(int line, bool save_pos)
return; return;
} }
/* Bounds check. */ /* Do a bounds check. Display a warning on an out-of-bounds
* line number only if we hit Enter at the statusbar prompt. */
if (!parse_num(answer, &line) || line < 0) { if (!parse_num(answer, &line) || line < 0) {
statusbar(_("Come on, be reasonable")); if (i == 0)
statusbar(_("Come on, be reasonable"));
display_main_list(); display_main_list();
return; return;
} }

72
src/winio.c
View File

@ -2161,44 +2161,44 @@ int statusq(bool allow_tabs, const shortcut *s, const char *def,
resetstatuspos = FALSE; resetstatuspos = FALSE;
switch (ret) { switch (ret) {
case NANO_FIRSTLINE_KEY: case NANO_FIRSTLINE_KEY:
case NANO_FIRSTLINE_FKEY: case NANO_FIRSTLINE_FKEY:
do_first_line(); do_first_line();
resetstatuspos = TRUE; resetstatuspos = TRUE;
break; break;
case NANO_LASTLINE_KEY: case NANO_LASTLINE_KEY:
case NANO_LASTLINE_FKEY: case NANO_LASTLINE_FKEY:
do_last_line(); do_last_line();
resetstatuspos = TRUE; resetstatuspos = TRUE;
break; break;
#ifndef DISABLE_JUSTIFY #ifndef DISABLE_JUSTIFY
case NANO_PARABEGIN_KEY: case NANO_PARABEGIN_KEY:
case NANO_PARABEGIN_ALTKEY1: case NANO_PARABEGIN_ALTKEY1:
case NANO_PARABEGIN_ALTKEY2: case NANO_PARABEGIN_ALTKEY2:
do_para_begin(); do_para_begin();
resetstatuspos = TRUE; resetstatuspos = TRUE;
break; break;
case NANO_PARAEND_KEY: case NANO_PARAEND_KEY:
case NANO_PARAEND_ALTKEY1: case NANO_PARAEND_ALTKEY1:
case NANO_PARAEND_ALTKEY2: case NANO_PARAEND_ALTKEY2:
do_para_end(); do_para_end();
resetstatuspos = TRUE; resetstatuspos = TRUE;
break; break;
case NANO_FULLJUSTIFY_KEY: case NANO_FULLJUSTIFY_KEY:
case NANO_FULLJUSTIFY_ALTKEY: case NANO_FULLJUSTIFY_ALTKEY:
if (!ISSET(VIEW_MODE)) if (!ISSET(VIEW_MODE))
do_full_justify(); do_full_justify();
resetstatuspos = TRUE; resetstatuspos = TRUE;
break; break;
#endif #endif
case NANO_CANCEL_KEY: case NANO_CANCEL_KEY:
ret = -1; ret = -1;
resetstatuspos = TRUE; resetstatuspos = TRUE;
break; break;
case NANO_ENTER_KEY: case NANO_ENTER_KEY:
ret = (answer[0] == '\0') ? -2 : 0; ret = (answer[0] == '\0') ? -2 : 0;
resetstatuspos = TRUE; resetstatuspos = TRUE;
break; break;
} }
blank_statusbar(); blank_statusbar();