mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(edit_copy_to_X_buf_cmd): return gboolean instead of int. 

(edit_cut_to_X_buf_cmd): likewise.
(edit_paste_from_X_buf_cmd): return gboolean.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2012-08-12 19:41:39 +04:00
parent 70528dc30a
commit 7d2975a53e
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -287,9 +287,9 @@ gboolean edit_load_macro_cmd (WEdit * edit);
void edit_delete_macro_cmd (WEdit * edit);
gboolean edit_repeat_macro_cmd (WEdit * edit);
int edit_copy_to_X_buf_cmd (WEdit * edit);
int edit_cut_to_X_buf_cmd (WEdit * edit);
void edit_paste_from_X_buf_cmd (WEdit * edit);
gboolean edit_copy_to_X_buf_cmd (WEdit * edit);
gboolean edit_cut_to_X_buf_cmd (WEdit * edit);
gboolean edit_paste_from_X_buf_cmd (WEdit * edit);
void edit_select_codepage_cmd (WEdit * edit);
void edit_insert_literal_cmd (WEdit * edit);

27
src/editor/editcmd.c
View File

@ -2974,58 +2974,63 @@ edit_paste_from_history (WEdit * edit)
/* --------------------------------------------------------------------------------------------- */
int
gboolean
edit_copy_to_X_buf_cmd (WEdit * edit)
{
long start_mark, end_mark;
if (eval_marks (edit, &start_mark, &end_mark))
return 0;
return TRUE;
if (!edit_save_block_to_clip_file (edit, start_mark, end_mark))
{
edit_error_dialog (_("Copy to clipboard"), get_sys_error (_("Unable to save to file")));
return 1;
return FALSE;
}
/* try use external clipboard utility */
mc_event_raise (MCEVENT_GROUP_CORE, "clipboard_file_to_ext_clip", NULL);
return 0;
return TRUE;
}
/* --------------------------------------------------------------------------------------------- */
int
gboolean
edit_cut_to_X_buf_cmd (WEdit * edit)
{
long start_mark, end_mark;
if (eval_marks (edit, &start_mark, &end_mark))
return 0;
return TRUE;
if (!edit_save_block_to_clip_file (edit, start_mark, end_mark))
{
edit_error_dialog (_("Cut to clipboard"), _("Unable to save to file"));
return 1;
return FALSE;
}
/* try use external clipboard utility */
mc_event_raise (MCEVENT_GROUP_CORE, "clipboard_file_to_ext_clip", NULL);
edit_block_delete_cmd (edit);
edit_mark_cmd (edit, TRUE);
return 0;
return TRUE;
}
/* --------------------------------------------------------------------------------------------- */
void
gboolean
edit_paste_from_X_buf_cmd (WEdit * edit)
{
vfs_path_t *tmp;
gboolean ret;
/* try use external clipboard utility */
mc_event_raise (MCEVENT_GROUP_CORE, "clipboard_file_from_ext_clip", NULL);
tmp = mc_config_get_full_vpath (EDIT_CLIP_FILE);
edit_insert_file (edit, tmp);
ret = (edit_insert_file (edit, tmp) >= 0);
vfs_path_free (tmp);
}
return ret;
}
/* --------------------------------------------------------------------------------------------- */
/**