mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3996_dynamic_format_fix'

Browse Source 
* 3996_dynamic_format_fix:
  Ticket #3996: fix of broken dynamic paragraph formatting.
This commit is contained in:
Andrew Borodin 2019-07-20 19:03:31 +03:00
commit 3a1f3d7ff7
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/editor/format.c
View File

@ -448,6 +448,7 @@ put_paragraph (WEdit * edit, unsigned char *t, off_t p, long indent, off_t size)
if (c != t[i]) if (c != t[i])
replace_at (edit, p, t[i]); replace_at (edit, p, t[i]);
} }
edit_cursor_move (edit, cursor - edit->buffer.curs1); /* restore cursor position */
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
@ -527,31 +528,12 @@ format_paragraph (WEdit * edit, gboolean force)
#ifdef HAVE_CHARSET #ifdef HAVE_CHARSET
utf8 = edit->utf8; utf8 = edit->utf8;
#endif #endif
/* scroll up to show 1st line of paragraph */
edit_move_up (edit, lines, TRUE);
/* scroll left as much as possible to show the formatted paragraph */
edit_scroll_left (edit, -edit->start_col);
format_this (t2, q - p, indent, utf8); format_this (t2, q - p, indent, utf8);
put_paragraph (edit, t2, p, indent, size); put_paragraph (edit, t2, p, indent, size);
g_free ((char *) t2); g_free ((char *) t2);
/* move to the end of paragraph */ /* Scroll left as much as possible to show the formatted paragraph */
q = end_paragraph (edit, force); edit_scroll_left (edit, -edit->start_col);
edit_cursor_move (edit, q - edit->buffer.curs1);
/* try move to the start of next paragraph */
if (edit->buffer.curs_line < edit->buffer.lines)
{
edit_execute_cmd (edit, CK_Home, -1);
do
{
edit_execute_cmd (edit, CK_Down, -1);
}
while (edit->buffer.curs_line < edit->buffer.lines
&& edit_line_is_blank (edit, edit->buffer.curs_line));
}
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */