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

Use DLR's home/end patch instead of mine, because it's cleaner and remove some unneeded code in do_help() 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1510 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Chris Allegretta 2003-08-04 02:12:03 +00:00
parent 13f094e80e
commit 653d614439
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -9,13 +9,16 @@ CVS code -
- Tweak to avoid a potential problem when strp is non-NULL but - Tweak to avoid a potential problem when strp is non-NULL but
*strp is NULL. (David Benbennick) *strp is NULL. (David Benbennick)
- winio.c: - winio.c:
do_help()
- Get rid of keypad_on() call for bottomwin, which should not be
needed (DLR).
nanogetstr() nanogetstr()
- Fix problem with search history where a temporary string - Fix problem with search history where a temporary string
added at the bottom of the history (but which was not in the added at the bottom of the history (but which was not in the
history) would not be preserved after scrolling down to the history) would not be preserved after scrolling down to the
blank bottom entry and then scrolling back up. (DLR) blank bottom entry and then scrolling back up. (DLR)
- Add handler for Alt-[-H and F as home and end when -K is - Handle Alt-[-F and H (DLR, fixed home and end not working with
used. Basically a workaround until a cleaner way can be found. -K in statusbar).
- configure.ac: - configure.ac:
- Change the program used to detect a broken regexec() function - Change the program used to detect a broken regexec() function
so that it works properly, using information found at so that it works properly, using information found at

10
winio.c
View File

@ -294,12 +294,10 @@ int nanogetstr(int allowtabs, const char *buf, const char *def,
#endif #endif
case NANO_HOME_KEY: case NANO_HOME_KEY:
case KEY_HOME: case KEY_HOME:
do_home:
x = 0; x = 0;
break; break;
case NANO_END_KEY: case NANO_END_KEY:
case KEY_END: case KEY_END:
do_end:
x = xend; x = xend;
break; break;
case KEY_RIGHT: case KEY_RIGHT:
@ -488,10 +486,10 @@ int nanogetstr(int allowtabs, const char *buf, const char *def,
x--; x--;
break; break;
case 'F': case 'F':
goto do_end; x = xend;
break; break;
case 'H': case 'H':
goto do_home; x = 0;
break; break;
case '1': case '1':
case '7': case '7':
@ -1545,7 +1543,7 @@ int line_len(const char *ptr)
int do_help(void) int do_help(void)
{ {
#ifndef DISABLE_HELP #ifndef DISABLE_HELP
int i, page = 0, kbinput = 0, no_more = 0, kp, kp2; int i, page = 0, kbinput = 0, no_more = 0, kp;
int no_help_flag = 0; int no_help_flag = 0;
const shortcut *oldshortcut; const shortcut *oldshortcut;
@ -1563,7 +1561,6 @@ int do_help(void)
currshortcut = help_list; currshortcut = help_list;
kp = keypad_on(edit, 1); kp = keypad_on(edit, 1);
kp2 = keypad_on(bottomwin, 1);
if (ISSET(NO_HELP)) { if (ISSET(NO_HELP)) {
@ -1665,7 +1662,6 @@ int do_help(void)
curs_set(1); curs_set(1);
edit_refresh(); edit_refresh();
kp = keypad_on(edit, kp); kp = keypad_on(edit, kp);
kp2 = keypad_on(bottomwin, kp2);
/* The help_init() at the beginning allocated help_text, which has /* The help_init() at the beginning allocated help_text, which has
now been written to screen. */ now been written to screen. */