mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-24 04:02:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

(edit_insert_file_cmd): sync with new edit_insert_file()

Browse Source 
...and make minor optimization.

(cherry picked from commit 8fae57a1f5)

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2012-01-05 18:15:27 +03:00
parent 7e8fee6486
commit 402ad8519d
2 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,7 +241,7 @@ void edit_complete_word_cmd (WEdit * edit);
void edit_get_match_keyword_cmd (WEdit * edit); void edit_get_match_keyword_cmd (WEdit * edit);
int edit_save_block (WEdit * edit, const char *filename, long start, long finish); int edit_save_block (WEdit * edit, const char *filename, long start, long finish);
int edit_save_block_cmd (WEdit * edit); int edit_save_block_cmd (WEdit * edit);
int edit_insert_file_cmd (WEdit * edit); gboolean edit_insert_file_cmd (WEdit * edit);
void edit_insert_over (WEdit * edit); void edit_insert_over (WEdit * edit);
int edit_insert_column_of_text_from_file (WEdit * edit, int file, int edit_insert_column_of_text_from_file (WEdit * edit, int file,
long *start_pos, long *end_pos, int *col1, int *col2); long *start_pos, long *end_pos, int *col1, int *col2);

36
src/editor/editcmd.c
View File

@ -2778,43 +2778,33 @@ edit_save_block_cmd (WEdit * edit)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
/** returns 1 on success */ /** returns TRUE on success */
int gboolean
edit_insert_file_cmd (WEdit * edit) edit_insert_file_cmd (WEdit * edit)
{ {
gchar *tmp; gchar *tmp;
char *exp; char *exp;
gboolean ret = FALSE;
tmp = mc_config_get_full_path (EDIT_CLIP_FILE); tmp = mc_config_get_full_path (EDIT_CLIP_FILE);
exp = input_expand_dialog (_("Insert file"), _("Enter file name:"), exp = input_expand_dialog (_("Insert file"), _("Enter file name:"),
MC_HISTORY_EDIT_INSERT_FILE, tmp); MC_HISTORY_EDIT_INSERT_FILE, tmp);
g_free (tmp); g_free (tmp);
edit_push_undo_action (edit, KEY_PRESS + edit->start_display); edit_push_undo_action (edit, KEY_PRESS + edit->start_display);
if (exp)
if (exp != NULL && *exp != '\0')
{ {
if (!*exp) ret = (edit_insert_file (edit, exp) >= 0);
{ if (!ret)
g_free (exp); edit_error_dialog (_("Insert file"), get_sys_error (_("Cannot insert file")));
return 0;
}
else
{
if (edit_insert_file (edit, exp) != 0)
{
g_free (exp);
edit->force |= REDRAW_COMPLETELY;
return 1;
}
else
{
g_free (exp);
edit_error_dialog (_("Insert file"), get_sys_error (_("Cannot insert file")));
}
}
} }
g_free (exp);
edit->force |= REDRAW_COMPLETELY; edit->force |= REDRAW_COMPLETELY;
return 0; return ret;
} }
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */