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

Merge branch '2881_editor_offset_after_tab' 

* 2881_editor_offset_after_tab:
  Ticket #2881: (edit_move_forward3): fix two-columns extra offset of cursor
This commit is contained in:
Andrew Borodin 2012-09-11 12:49:06 +04:00
parent b4a10d82cc 28cd54da5a
commit ad44cd1abb
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/editor/edit.c
View File

@ -3073,16 +3073,15 @@ edit_move_forward3 (WEdit * edit, off_t current, long cols, off_t upto)
c = convert_to_display_c (c); c = convert_to_display_c (c);
#endif #endif
if (c == '\n')
return (upto != 0 ? (off_t) col : p);
if (c == '\t') if (c == '\t')
col += TAB_SIZE - col % TAB_SIZE; col += TAB_SIZE - col % TAB_SIZE;
else if (c == '\n') else if ((c < 32 || c == 127) && (orig_c == c
return (upto != 0 ? (off_t) col : p);
if ((c < 32 || c == 127) && (orig_c == c
#ifdef HAVE_CHARSET #ifdef HAVE_CHARSET
|| (!mc_global.utf8_display && !edit->utf8) || (!mc_global.utf8_display && !edit->utf8)
#endif #endif
)) ))
/* '\r' is shown as ^M, so we must advance 2 characters */ /* '\r' is shown as ^M, so we must advance 2 characters */
/* Caret notation for control characters */ /* Caret notation for control characters */
col += 2; col += 2;