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

- Fix cursor position being saved when escaping out of nanogetstr with keys like ^Y and ^V. New arg resetpos to nanogetstr(), added static int resetpos in statusq() (bug found by DLR) 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1399 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Chris Allegretta 2003-01-26 21:01:16 +00:00
parent 8a85aa0baa
commit 47fcfe5d78
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -8,6 +8,10 @@ CVS Code -
- Fix subexpression replacement to work consistently.
Affects search.c:replace_regexp() and
utils.c:strstrwrapper() (David Benbennick).
- Fix cursor position being saved when escaping out
of nanogetstr with keys like ^Y and ^V. New arg
resetpos to nanogetstr(), added static int
resetpos in statusq() (bug found by DLR).
- cut.c:
do_cut_text()
- Fix incorrect cursor location when cutting long lines

2
proto.h
View File

@ -425,7 +425,7 @@ int nanogetstr(int allowtabs, const char *buf, const char *def,
#ifndef DISABLE_TABCOMP
, int *list
#endif
);
, int resetpos);
void set_modified(void);
void titlebar(const char *path);
void bottombars(const shortcut *s);

12
winio.c
View File

@ -194,7 +194,7 @@ int nanogetstr(int allowtabs, const char *buf, const char *def,
#ifndef DISABLE_TABCOMP
, int *list
#endif
)
, int resetpos)
{
int kbinput;
static int x = -1;
@ -218,7 +218,7 @@ int nanogetstr(int allowtabs, const char *buf, const char *def,
it would be past the end of the string as it is. Otherwise,
leave it alone. This is so the cursor position stays at the same
place if a prompt-changing toggle is pressed. */
if (x == -1 || x > xend)
if (x == -1 || x > xend || resetpos)
x = xend;
answer = (char *)nrealloc(answer, xend + 1);
@ -1175,6 +1175,8 @@ int statusq(int tabs, const shortcut *s, const char *def,
#ifndef DISABLE_TABCOMP
int list = 0;
#endif
static int resetpos = 0; /* Do we need to scrap the cursor position
on the statusbar? */
bottombars(s);
@ -1191,18 +1193,22 @@ int statusq(int tabs, const shortcut *s, const char *def,
#ifndef DISABLE_TABCOMP
, &list
#endif
);
, resetpos);
free(foo);
resetpos = 0;
switch (ret) {
case NANO_FIRSTLINE_KEY:
do_first_line();
resetpos = 1;
break;
case NANO_LASTLINE_KEY:
do_last_line();
resetpos = 1;
break;
case NANO_CANCEL_KEY:
ret = -1;
resetpos = 1;
break;
default:
blank_statusbar();