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

code indentation

Browse Source 
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
This commit is contained in:
Slava Zanko 2012-09-10 15:58:46 +03:00
parent d92a9fa9ac
commit 02bf6e2c59
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/editor/edit.c
View File

@ -2571,7 +2571,7 @@ edit_push_undo_action (WEdit * edit, long c, ...)
d = edit->undo_stack[(sp - 2) & edit->undo_stack_size_mask]; d = edit->undo_stack[(sp - 2) & edit->undo_stack_size_mask];
if (d == c && edit->undo_stack[spm1] > -1000000000) 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]--; edit->undo_stack[spm1]--;
return; return;
} }
@ -2652,7 +2652,7 @@ edit_push_redo_action (WEdit * edit, long c, ...)
d = edit->redo_stack[(sp - 2) & edit->redo_stack_size_mask]; d = edit->redo_stack[(sp - 2) & edit->redo_stack_size_mask];
if (d == c && edit->redo_stack[spm1] > -1000000000) 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]--; edit->redo_stack[spm1]--;
return; return;
} }
@ -3094,7 +3094,7 @@ edit_move_forward3 (WEdit * edit, off_t current, long cols, off_t upto)
#ifdef HAVE_CHARSET #ifdef HAVE_CHARSET
|| (!mc_global.utf8_display && !edit->utf8) || (!mc_global.utf8_display && !edit->utf8)
#endif #endif
)) ))
/* '\r' is shown as ^M, so we must advance 2 characters */ /* '\r' is shown as ^M, so we must advance 2 characters */
/* Caret notation for control characters */ /* Caret notation for control characters */
col += 2; 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)); edit->curs_col -= (edit->curs_col % (HALF_TAB_SIZE * space_width));
p = edit_bol (edit, edit->curs1); p = edit_bol (edit, edit->curs1);
edit_cursor_move (edit, edit_cursor_move (edit,
edit_move_forward3 (edit, p, edit->curs_col, edit_move_forward3 (edit, p, edit->curs_col, 0) - edit->curs1);
0) - edit->curs1);
if (!left_of_four_spaces (edit)) if (!left_of_four_spaces (edit))
edit_cursor_move (edit, edit_move_forward3 (edit, p, q, 0) - edit->curs1); edit_cursor_move (edit, edit_move_forward3 (edit, p, q, 0) - edit->curs1);
} }

14
src/editor/editdraw.c
View File

@ -155,11 +155,9 @@ status_string (WEdit * edit, char *s, int w)
edit->curs_line + 1, edit->curs_line + 1,
edit->total_lines + 1, (long) edit->curs1, (long) edit->last_byte, byte_str, edit->total_lines + 1, (long) edit->curs1, (long) edit->last_byte, byte_str,
#ifdef HAVE_CHARSET #ifdef HAVE_CHARSET
mc_global.source_codepage >= mc_global.source_codepage >= 0 ? get_codepage_id (mc_global.source_codepage) :
0 ? get_codepage_id (mc_global.source_codepage) :
#endif #endif
"" "");
);
else else
g_snprintf (s, w, g_snprintf (s, w,
"[%c%c%c%c] %2ld L:[%3ld+%2ld %3ld/%3ld] *(%-4ld/%4ldb) %s %s", "[%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->curs_line + 1,
edit->total_lines + 1, (long) edit->curs1, (long) edit->last_byte, byte_str, edit->total_lines + 1, (long) edit->curs1, (long) edit->last_byte, byte_str,
#ifdef HAVE_CHARSET #ifdef HAVE_CHARSET
mc_global.source_codepage >= mc_global.source_codepage >= 0 ? get_codepage_id (mc_global.source_codepage) :
0 ? get_codepage_id (mc_global.source_codepage) :
#endif #endif
"" "");
);
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
@ -420,7 +416,7 @@ edit_draw_this_line (WEdit * edit, off_t b, long row, long start_col, long end_c
switch (c) switch (c)
{ {
case '\n': case '\n':
col = end_col - edit->start_col + 1; /* quit */ col = end_col - edit->start_col + 1; /* quit */
break; break;
case '\t': case '\t':
i = TAB_SIZE - ((int) col % TAB_SIZE); i = TAB_SIZE - ((int) col % TAB_SIZE);