From 02bf6e2c5916589e19ffafd983719c089801470b Mon Sep 17 00:00:00 2001 From: Slava Zanko Date: Mon, 10 Sep 2012 15:58:46 +0300 Subject: [PATCH] code indentation Signed-off-by: Slava Zanko --- src/editor/edit.c | 9 ++++----- src/editor/editdraw.c | 14 +++++--------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/editor/edit.c b/src/editor/edit.c index d326d0fe7..754e1ebc5 100644 --- a/src/editor/edit.c +++ b/src/editor/edit.c @@ -2571,7 +2571,7 @@ edit_push_undo_action (WEdit * edit, long c, ...) d = edit->undo_stack[(sp - 2) & edit->undo_stack_size_mask]; if (d == c && edit->undo_stack[spm1] > -1000000000) { - if (c < KEY_PRESS) /* --> no need to push multiple do-nothings */ + if (c < KEY_PRESS) /* --> no need to push multiple do-nothings */ edit->undo_stack[spm1]--; return; } @@ -2652,7 +2652,7 @@ edit_push_redo_action (WEdit * edit, long c, ...) d = edit->redo_stack[(sp - 2) & edit->redo_stack_size_mask]; if (d == c && edit->redo_stack[spm1] > -1000000000) { - if (c < KEY_PRESS) /* --> no need to push multiple do-nothings */ + if (c < KEY_PRESS) /* --> no need to push multiple do-nothings */ edit->redo_stack[spm1]--; return; } @@ -3094,7 +3094,7 @@ edit_move_forward3 (WEdit * edit, off_t current, long cols, off_t upto) #ifdef HAVE_CHARSET || (!mc_global.utf8_display && !edit->utf8) #endif - )) + )) /* '\r' is shown as ^M, so we must advance 2 characters */ /* Caret notation for control characters */ col += 2; @@ -3250,8 +3250,7 @@ edit_move_to_prev_col (WEdit * edit, off_t p) edit->curs_col -= (edit->curs_col % (HALF_TAB_SIZE * space_width)); p = edit_bol (edit, edit->curs1); edit_cursor_move (edit, - edit_move_forward3 (edit, p, edit->curs_col, - 0) - edit->curs1); + edit_move_forward3 (edit, p, edit->curs_col, 0) - edit->curs1); if (!left_of_four_spaces (edit)) edit_cursor_move (edit, edit_move_forward3 (edit, p, q, 0) - edit->curs1); } diff --git a/src/editor/editdraw.c b/src/editor/editdraw.c index ea2813221..53030b2db 100644 --- a/src/editor/editdraw.c +++ b/src/editor/editdraw.c @@ -155,11 +155,9 @@ status_string (WEdit * edit, char *s, int w) edit->curs_line + 1, edit->total_lines + 1, (long) edit->curs1, (long) edit->last_byte, byte_str, #ifdef HAVE_CHARSET - mc_global.source_codepage >= - 0 ? get_codepage_id (mc_global.source_codepage) : + mc_global.source_codepage >= 0 ? get_codepage_id (mc_global.source_codepage) : #endif - "" - ); + ""); else g_snprintf (s, w, "[%c%c%c%c] %2ld L:[%3ld+%2ld %3ld/%3ld] *(%-4ld/%4ldb) %s %s", @@ -173,11 +171,9 @@ status_string (WEdit * edit, char *s, int w) edit->curs_line + 1, edit->total_lines + 1, (long) edit->curs1, (long) edit->last_byte, byte_str, #ifdef HAVE_CHARSET - mc_global.source_codepage >= - 0 ? get_codepage_id (mc_global.source_codepage) : + mc_global.source_codepage >= 0 ? get_codepage_id (mc_global.source_codepage) : #endif - "" - ); + ""); } /* --------------------------------------------------------------------------------------------- */ @@ -420,7 +416,7 @@ edit_draw_this_line (WEdit * edit, off_t b, long row, long start_col, long end_c switch (c) { case '\n': - col = end_col - edit->start_col + 1; /* quit */ + col = end_col - edit->start_col + 1; /* quit */ break; case '\t': i = TAB_SIZE - ((int) col % TAB_SIZE);