minor cosmetic and constant cursor position display fixes

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2806 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-07-01 22:58:47 +00:00
parent d5092294cd
commit 9c3249c893
3 changed files with 26 additions and 8 deletions

View File

@ -1,4 +1,17 @@
CVS code -
- General:
- Miscellaneous comment fixes. (DLR)
- nano.c:
allow_pending_sigwinch()
- Simplify by using the "?" operator instead of an if clause.
(DLR)
do_verbatim_input()
- If constant cursor position display is on when we finish, make
sure the cursor position is displayed properly. (DLR)
main()
- When constant cursor position display is on, only display the
cursor position if there are no keys waiting in the buffer.
(DLR)
GNU nano 1.3.8 - 2005.06.30
- General:

View File

@ -2339,6 +2339,7 @@ char *input_tab(char *buf, size_t *place, bool *lastwastab, bool *list)
if ((match + 1) % columns == 0)
editline++;
}
wrefresh(edit);
*list = TRUE;
}
@ -2899,6 +2900,7 @@ char *histfilename(void)
return nanohist;
}
/* Load histories from ~/.nano_history. */
void load_history(void)
{
char *nanohist = histfilename();

View File

@ -1299,6 +1299,11 @@ void do_verbatim_input(void)
do_output(output, kbinput_len, TRUE);
free(output);
/* If constant cursor position display is on, make sure the current
* cursor position is properly displayed on the statusbar. */
if (ISSET(CONST_UPDATE))
do_cursorpos(TRUE);
}
void do_backspace(void)
@ -3683,10 +3688,7 @@ void allow_pending_sigwinch(bool allow)
sigset_t winch;
sigemptyset(&winch);
sigaddset(&winch, SIGWINCH);
if (allow)
sigprocmask(SIG_UNBLOCK, &winch, NULL);
else
sigprocmask(SIG_BLOCK, &winch, NULL);
sigprocmask(allow ? SIG_UNBLOCK : SIG_BLOCK, &winch, NULL);
}
#endif /* !NANO_SMALL */
@ -3911,7 +3913,7 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool
if (have_shortcut) {
switch (input) {
/* Handle the "universal" statusbar prompt shortcuts. */
/* Handle the "universal" edit window shortcuts. */
case NANO_XON_KEY:
statusbar(_("XON ignored, mumble mumble."));
break;
@ -4682,9 +4684,10 @@ int main(int argc, char **argv)
/* Make sure the cursor is in the edit window. */
reset_cursor();
/* If constant cursor position display is on, display the
* current cursor position on the statusbar. */
if (ISSET(CONST_UPDATE))
/* If constant cursor position display is on, and there are no
* keys waiting in the buffer, display the current cursor
* position on the statusbar. */
if (ISSET(CONST_UPDATE) && get_buffer_len() == 0)
do_cursorpos(TRUE);
currshortcut = main_list;