From 2120010cf95668314bb8b5ab97714991d0bcae72 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 23 Jun 2019 20:33:16 +0300 Subject: [PATCH] Ticket #3996: fix of broken dynamic paragraph formatting. Revert "Ticket #1666: fix paragraph formatting." This reverts commit ccb7ab341e775892f05c0ded3dce0423c6aab585. Signed-off-by: Andrew Borodin --- src/editor/format.c | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/src/editor/format.c b/src/editor/format.c index 4d0f40f1a..f20be6000 100644 --- a/src/editor/format.c +++ b/src/editor/format.c @@ -448,6 +448,7 @@ put_paragraph (WEdit * edit, unsigned char *t, off_t p, long indent, off_t size) if (c != 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 utf8 = edit->utf8; #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); put_paragraph (edit, t2, p, indent, size); g_free ((char *) t2); - /* move to the end of paragraph */ - q = end_paragraph (edit, force); - 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)); - } + /* Scroll left as much as possible to show the formatted paragraph */ + edit_scroll_left (edit, -edit->start_col); } /* --------------------------------------------------------------------------------------------- */