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

(edit_block_delete_cmd): return boolean.

Browse Source 
(edit_block_delete): likewize.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2023-11-29 21:42:46 +03:00
parent f29c5a35f7
commit e2e34d82ab
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/editor/edit-impl.h
View File

@ -163,7 +163,7 @@ void edit_set_codeset (WEdit * edit);
void edit_block_copy_cmd (WEdit * edit);
void edit_block_move_cmd (WEdit * edit);
int edit_block_delete_cmd (WEdit * edit);
gboolean edit_block_delete_cmd (WEdit * edit);
void edit_delete_line (WEdit * edit);
int edit_delete (WEdit * edit, gboolean byte_delete);

4
src/editor/edit.c
View File

@ -1808,14 +1808,14 @@ edit_user_menu (WEdit * edit, const char *menu_file, int selected_entry)
if (user_menu_cmd (CONST_WIDGET (edit), menu_file, selected_entry)
&& (mc_stat (block_file_vpath, &status) == 0) && (status.st_size != 0))
{
int rc = 0;
gboolean rc = FALSE;
FILE *fd;
/* i.e. we have marked block */
if (mark)
rc = edit_block_delete_cmd (edit);
if (rc == 0)
if (!rc)
{
off_t ins_len;

16
src/editor/editcmd.c
View File

@ -495,9 +495,9 @@ edit_delete_column_of_text (WEdit * edit, off_t m1, off_t m2)
}
/* --------------------------------------------------------------------------------------------- */
/** if success return 0 */
/** if success return TRUE */
static int
static gboolean
edit_block_delete (WEdit * edit, off_t start_mark, off_t end_mark)
{
off_t curs_pos;
@ -511,7 +511,7 @@ edit_block_delete (WEdit * edit, off_t start_mark, off_t end_mark)
edit_query_dialog2 (_("Warning"),
("Block is large, you may not be able to undo this action"),
_("C&ontinue"), _("&Cancel")) != 0)
return 1;
return FALSE;
c1 = MIN (edit->column1, edit->column2);
c2 = MAX (edit->column1, edit->column2);
@ -557,7 +557,7 @@ edit_block_delete (WEdit * edit, off_t start_mark, off_t end_mark)
edit_set_markers (edit, 0, 0, 0, 0);
edit->force |= REDRAW_PAGE;
return 0;
return TRUE;
}
/* --------------------------------------------------------------------------------------------- */
@ -1482,9 +1482,9 @@ edit_block_move_cmd (WEdit * edit)
}
/* --------------------------------------------------------------------------------------------- */
/** returns 1 if canceelled by user */
/** returns FALSE if canceelled by user */
int
gboolean
edit_block_delete_cmd (WEdit * edit)
{
off_t start_mark, end_mark;
@ -1494,7 +1494,7 @@ edit_block_delete_cmd (WEdit * edit)
edit_delete_line (edit);
return 0;
return TRUE;
}
/* --------------------------------------------------------------------------------------------- */
@ -1866,7 +1866,7 @@ edit_sort_cmd (WEdit * edit)
edit->force |= REDRAW_COMPLETELY;
if (edit_block_delete_cmd (edit))
if (!edit_block_delete_cmd (edit))
return 1;
{