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
commit ad44cd1abb
1 changed files with 5 additions and 6 deletions

View File

@ -3073,12 +3073,11 @@ edit_move_forward3 (WEdit * edit, off_t current, long cols, off_t upto)
c = convert_to_display_c (c);
#endif
if (c == '\n')
return (upto != 0 ? (off_t) col : p);
if (c == '\t')
col += TAB_SIZE - col % TAB_SIZE;
else if (c == '\n')
return (upto != 0 ? (off_t) col : p);
if ((c < 32 || c == 127) && (orig_c == c
else if ((c < 32 || c == 127) && (orig_c == c
#ifdef HAVE_CHARSET
|| (!mc_global.utf8_display && !edit->utf8)
#endif