From c81486c2027968f4713fc65c2a454acea032af42 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Wed, 30 Mar 2011 13:10:56 +0400 Subject: [PATCH] WEdit::screen_modified is unused. Removed. Signed-off-by: Andrew Borodin --- src/editor/edit-widget.h | 1 - src/editor/edit.c | 1 - src/editor/editdraw.c | 15 ++++++--------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/editor/edit-widget.h b/src/editor/edit-widget.h index 18ab9b68c..5eea225df 100644 --- a/src/editor/edit-widget.h +++ b/src/editor/edit-widget.h @@ -77,7 +77,6 @@ struct WEdit unsigned int modified:1; /* File has been modified and needs saving */ unsigned int loading_done:1; /* File has been loaded into the editor */ unsigned int locked:1; /* We hold lock on current file */ - unsigned int screen_modified:1; /* File has been changed since the last screen draw */ unsigned int delete_file:1; /* New file, needs to be deleted unless modified */ unsigned int highlight:1; /* There is a selected block */ unsigned int column_highlight:1; diff --git a/src/editor/edit.c b/src/editor/edit.c index b15251354..b11209809 100644 --- a/src/editor/edit.c +++ b/src/editor/edit.c @@ -652,7 +652,6 @@ static void edit_modification (WEdit * edit) { edit->caches_valid = 0; - edit->screen_modified = 1; /* raise lock when file modified */ if (!edit->modified && !edit->delete_file) diff --git a/src/editor/editdraw.c b/src/editor/editdraw.c index 7fbb2942a..0ce70aff6 100644 --- a/src/editor/editdraw.c +++ b/src/editor/editdraw.c @@ -630,7 +630,7 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row, while (row <= end_row) { if (key_pending (edit)) - goto exit_render; + return; edit_draw_this_line (edit, b, row, start_column, end_column); b = edit_move_forward (edit, b, 1, 0); row++; @@ -650,7 +650,7 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row, while (row <= upto) { if (key_pending (edit)) - goto exit_render; + return; edit_draw_this_line (edit, b, row, start_column, end_column); b = edit_move_forward (edit, b, 1, 0); } @@ -661,7 +661,7 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row, if (curs_row >= start_row && curs_row <= end_row) { if (key_pending (edit)) - goto exit_render; + return; edit_draw_this_line (edit, b, curs_row, start_column, end_column); } if (force & REDRAW_AFTER_CURSOR) @@ -673,7 +673,7 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row, while (row <= end_row) { if (key_pending (edit)) - goto exit_render; + return; edit_draw_this_line (edit, b, row, start_column, end_column); b = edit_move_forward (edit, b, 1, 0); row++; @@ -687,7 +687,7 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row, if (row >= start_row && row <= end_row) { if (key_pending (edit)) - goto exit_render; + return; edit_draw_this_line (edit, b, row, start_column, end_column); } } @@ -699,7 +699,7 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row, if (row >= start_row && row <= end_row) { if (key_pending (edit)) - goto exit_render; + return; edit_draw_this_line (edit, b, row, start_column, end_column); } } @@ -723,9 +723,6 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row, prev_curs_row = edit->curs_row; prev_curs = edit->curs1; - - exit_render: - edit->screen_modified = 0; } /* --------------------------------------------------------------------------------------------- */ -- 2.11.4.GIT