mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2153_wrong_selection_fix' 

* 2153_wrong_selection_fix:
  little optimization
  Ticket #2153 (editor wrong copy/move selected text)
This commit is contained in:
Ilia Maslakov 2010-07-05 15:22:35 +00:00
parent aacc4f371c 7dec7e5083
commit e72693f30a
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/editor/edit.c
View File

@ -1386,10 +1386,6 @@ edit_delete (WEdit * edit, const int byte_delete)
if (!edit->curs2)
return 0;
edit->mark1 -= (edit->mark1 > edit->curs1);
edit->mark2 -= (edit->mark2 > edit->curs1);
edit->last_get_rule -= (edit->last_get_rule > edit->curs1);
cw = 1;
/* if byte_delete = 1 then delete only one byte not multibyte char */
if (edit->utf8 && byte_delete == 0)
@ -1400,6 +1396,13 @@ edit_delete (WEdit * edit, const int byte_delete)
}
for (i = 1; i <= cw; i++)
{
if (edit->mark1 > edit->curs1)
edit->mark1--;
if (edit->mark2 > edit->curs1)
edit->mark2--;
if (edit->last_get_rule > edit->curs1)
edit->last_get_rule--;
p = edit->buffers2[(edit->curs2 - 1) >> S_EDIT_BUF_SIZE][EDIT_BUF_SIZE -
((edit->curs2 -
1) & M_EDIT_BUF_SIZE) - 1];
@ -1443,11 +1446,8 @@ edit_backspace (WEdit * edit, const int byte_delete)
if (!edit->curs1)
return 0;
edit->mark1 -= (edit->mark1 >= edit->curs1);
edit->mark2 -= (edit->mark2 >= edit->curs1);
edit->last_get_rule -= (edit->last_get_rule >= edit->curs1);
cw = 1;
if (edit->utf8 && byte_delete == 0)
{
edit_get_prev_utf (edit, edit->curs1, &cw);
@ -1456,6 +1456,13 @@ edit_backspace (WEdit * edit, const int byte_delete)
}
for (i = 1; i <= cw; i++)
{
if (edit->mark1 >= edit->curs1)
edit->mark1--;
if (edit->mark1 >= edit->curs1)
edit->mark2--;
if (edit->last_get_rule >= edit->curs1)
edit->last_get_rule--;
p = *(edit->buffers1[(edit->curs1 - 1) >> S_EDIT_BUF_SIZE] +
((edit->curs1 - 1) & M_EDIT_BUF_SIZE));
if (!((edit->curs1 - 1) & M_EDIT_BUF_SIZE))