diff --git a/doc/man/mc.1.in b/doc/man/mc.1.in index c895ec10d..160dbea52 100644 --- a/doc/man/mc.1.in +++ b/doc/man/mc.1.in @@ -3992,21 +3992,21 @@ contents of the selected directory. This variable holds the lifetime of a directory cache entry in seconds. The default value is 900 seconds. .TP -.I clipbord_store +.I clipboard_store This variable contains path (with options) to the external clipboard utility like 'xclip' to read text into X selection from file. For example: .PP .nf -clipbord_store=xclip \-i +clipboard_store=xclip \-i .TP -.I clipbord_paste +.I clipboard_paste This variable contains path (with options) to the external clipboard utility like 'xclip' to print the selection to standard out. For example: .PP .nf -clipbord_store=xclip \-o +clipboard_store=xclip \-o .TP .I autodetect_codeset This option allows use the `enca' command to autodetect codeset of text files diff --git a/doc/man/ru/mc.1.in b/doc/man/ru/mc.1.in index cbcf6fcae..814ec0499 100644 --- a/doc/man/ru/mc.1.in +++ b/doc/man/ru/mc.1.in @@ -4285,23 +4285,23 @@ mc.ext\&. просмотре в одной из панелей структуры дерева каталогов во второй панели автоматически будет отображаться список файлов выбранного каталога. .TP -.I clipbord_store +.I clipboard_store Эта переменная позволяет назначить внешнюю программу (с параметрами) для работы с буфером обмена, такую как 'xclip', для вставки данных в системный буфер обмена. Например: .PP .nf -clipbord_store=xclip \-i +clipboard_store=xclip \-i .TP -.I clipbord_paste +.I clipboard_paste Эта переменная позволяет назначить внешнюю программу (с параметрами) для работы с буфером обмена, такую как 'xclip', для получения данных из системного буфера обмена. Например: .PP .nf -clipbord_store=xclip \-o +clipboard_store=xclip \-o .PP .I autodetect_codeset .IP diff --git a/src/clipboard.c b/src/clipboard.c index 7de7a60f1..e5b2c4303 100644 --- a/src/clipboard.c +++ b/src/clipboard.c @@ -44,11 +44,11 @@ copy_file_to_ext_clip (void) int res = 0; const char *d = getenv ("DISPLAY"); - if (d == NULL || clipbord_store_path == NULL || clipbord_store_path[0] =='\0') + if (d == NULL || clipboard_store_path == NULL || clipboard_store_path[0] =='\0') return FALSE; tmp = concat_dir_and_file (home_dir, EDIT_CLIP_FILE); - cmd = g_strconcat (clipbord_store_path, " ", tmp, " 2>/dev/null", (char *) NULL); + cmd = g_strconcat (clipboard_store_path, " ", tmp, " 2>/dev/null", (char *) NULL); if (cmd != NULL) res = my_system (EXECUTE_AS_SHELL, shell, cmd); @@ -65,11 +65,11 @@ paste_to_file_from_ext_clip (void) int res = 0; const char *d = getenv ("DISPLAY"); - if (d == NULL || clipbord_paste_path == NULL || clipbord_paste_path[0] == '\0') + if (d == NULL || clipboard_paste_path == NULL || clipboard_paste_path[0] == '\0') return FALSE; tmp = concat_dir_and_file (home_dir, EDIT_CLIP_FILE); - cmd = g_strconcat (clipbord_paste_path, " > ", tmp, " 2>/dev/null", (char *) NULL); + cmd = g_strconcat (clipboard_paste_path, " > ", tmp, " 2>/dev/null", (char *) NULL); if (cmd != NULL) res = my_system (EXECUTE_AS_SHELL, shell, cmd); diff --git a/src/main.c b/src/main.c index 6e82de72a..53c508b1a 100644 --- a/src/main.c +++ b/src/main.c @@ -255,8 +255,8 @@ int boot_current_is_left = 1; int xtree_mode = 0; /* path to X clipboard utility */ -char* clipbord_store_path = NULL; -char* clipbord_paste_path = NULL; +char* clipboard_store_path = NULL; +char* clipboard_paste_path = NULL; /* If set, then print to the given file the last directory we were at */ static char *last_wd_string = NULL; @@ -2265,8 +2265,8 @@ main (int argc, char *argv[]) free_codepages_list (); g_free (autodetect_codeset); #endif - g_free (clipbord_store_path); - g_free (clipbord_paste_path); + g_free (clipboard_store_path); + g_free (clipboard_paste_path); str_uninit_strings (); diff --git a/src/main.h b/src/main.h index d416adb52..299625977 100644 --- a/src/main.h +++ b/src/main.h @@ -67,8 +67,8 @@ extern int eight_bit_clean; extern int full_eight_bits; #endif /* !HAVE_CHARSET */ -extern char *clipbord_store_path; -extern char *clipbord_paste_path; +extern char *clipboard_store_path; +extern char *clipboard_paste_path; extern int utf8_display; diff --git a/src/setup.c b/src/setup.c index 00e549dee..23ff5efd3 100644 --- a/src/setup.c +++ b/src/setup.c @@ -839,8 +839,8 @@ load_setup (void) if (buffer != NULL) utf8_display = str_isutf8 (buffer); #endif /* HAVE_CHARSET */ - clipbord_store_path = mc_config_get_string (mc_main_config, "Misc", "clipboard_store", ""); - clipbord_paste_path = mc_config_get_string (mc_main_config, "Misc", "clipboard_paste", ""); + clipboard_store_path = mc_config_get_string (mc_main_config, "Misc", "clipboard_store", ""); + clipboard_paste_path = mc_config_get_string (mc_main_config, "Misc", "clipboard_paste", ""); } gboolean @@ -872,8 +872,8 @@ save_setup (void) get_codepage_id (default_source_codepage)); mc_config_set_string (mc_main_config, "Misc", "autodetect_codeset", autodetect_codeset); #endif /* HAVE_CHARSET */ - mc_config_set_string (mc_main_config, "Misc", "clipboard_store", clipbord_store_path); - mc_config_set_string (mc_main_config, "Misc", "clipboard_paste", clipbord_paste_path); + mc_config_set_string (mc_main_config, "Misc", "clipboard_store", clipboard_store_path); + mc_config_set_string (mc_main_config, "Misc", "clipboard_paste", clipboard_paste_path); tmp_profile = g_build_filename (home_dir, MC_USERCONF_DIR, MC_CONFIG_FILE, NULL); ret = mc_config_save_to_file (mc_main_config, tmp_profile, NULL);