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

latest fixes 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1490 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Chris Allegretta 2003-04-16 02:08:23 +00:00
parent e1e0fd634b
commit 4b376a4982
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -55,6 +55,11 @@ CVS code -
setting current and current_x back to their original values, setting current and current_x back to their original values,
in case current_x's original value is greater than the width in case current_x's original value is greater than the width
of the screen. (DLR) of the screen. (DLR)
- winio.c:
nanogetstr()
- Remove a few unnecessary breaks occurring immediately after
gotos, and properly interpret the up and down arrow keys when
ALT_KEYPAD is set. (DLR)
- configure.ac: - configure.ac:
- Enable autodetection of broken regexec(). (DLR) Re-added - Enable autodetection of broken regexec(). (DLR) Re-added
regex.h check to ensure compile under Debian w/autoconf 1.6. regex.h check to ensure compile under Debian w/autoconf 1.6.

19
winio.c
View File

@ -358,6 +358,7 @@ int nanogetstr(int allowtabs, const char *buf, const char *def,
case KEY_UP: case KEY_UP:
case NANO_UP_KEY: case NANO_UP_KEY:
#ifndef NANO_SMALL #ifndef NANO_SMALL
do_upkey:
if (history_list != NULL) { if (history_list != NULL) {
/* If there's no previous temp holder, or if we already /* If there's no previous temp holder, or if we already
@ -383,6 +384,7 @@ int nanogetstr(int allowtabs, const char *buf, const char *def,
case KEY_DOWN: case KEY_DOWN:
case NANO_DOWN_KEY: case NANO_DOWN_KEY:
#ifndef NANO_SMALL #ifndef NANO_SMALL
do_downkey:
if (history_list != NULL) { if (history_list != NULL) {
/* get newer search from the history list */ /* get newer search from the history list */
if ((history = get_history_newer(history_list)) != NULL) { if ((history = get_history_newer(history_list)) != NULL) {
@ -421,6 +423,18 @@ int nanogetstr(int allowtabs, const char *buf, const char *def,
break; break;
case '[': case '[':
switch (kbinput = wgetch(edit)) { switch (kbinput = wgetch(edit)) {
case 'A':
#ifndef NANO_SMALL
goto do_upkey;
#else
break;
#endif
case 'B':
#ifndef NANO_SMALL
goto do_downkey;
#else
break;
#endif
case 'C': case 'C':
if (x < xend) if (x < xend)
x++; x++;
@ -836,7 +850,6 @@ void edit_add(const filestruct *fileptr, int yval, int start
if (paintlen == COLS) if (paintlen == COLS)
goto skip_step_two; goto skip_step_two;
step_two: /* Second step, we look for starts on this line. */ step_two: /* Second step, we look for starts on this line. */
start_col = 0; start_col = 0;
while (start_col < start + COLS) { while (start_col < start + COLS) {
@ -1532,19 +1545,15 @@ int do_help(void)
case '5': /* Alt-[-5 = Page Up */ case '5': /* Alt-[-5 = Page Up */
wgetch(edit); wgetch(edit);
goto do_pageupkey; goto do_pageupkey;
break;
case 'V': /* Alt-[-V = Page Up in Hurd Console */ case 'V': /* Alt-[-V = Page Up in Hurd Console */
case 'I': /* Alt-[-I = Page Up - FreeBSD Console */ case 'I': /* Alt-[-I = Page Up - FreeBSD Console */
goto do_pageupkey; goto do_pageupkey;
break;
case '6': /* Alt-[-6 = Page Down */ case '6': /* Alt-[-6 = Page Down */
wgetch(edit); wgetch(edit);
goto do_pagedownkey; goto do_pagedownkey;
break;
case 'U': /* Alt-[-U = Page Down in Hurd Console */ case 'U': /* Alt-[-U = Page Down in Hurd Console */
case 'G': /* Alt-[-G = Page Down - FreeBSD Console */ case 'G': /* Alt-[-G = Page Down - FreeBSD Console */
goto do_pagedownkey; goto do_pagedownkey;
break;
} }
break; break;
} }