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

Merge branch 'm-utf-8' of ssh://angel_il@midnight-commander.org:2222/git/mc into m-utf-8

Browse Source
This commit is contained in:
Ilia Maslakov 2009-04-20 14:55:39 +00:00
commit 17c4e67cb2
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.c
View File

@ -825,7 +825,7 @@ static menu_entry LeftMenu[] = {
{' ', "", NULL_HOTKEY, 0}, {' ', "", NULL_HOTKEY, 0},
{' ', N_("&Filter..."), NULL_HOTKEY, filter_cmd}, {' ', N_("&Filter..."), NULL_HOTKEY, filter_cmd},
{' ', "",NULL_HOTKEY, 0}, {' ', "",NULL_HOTKEY, 0},
{' ', N_("&Encoding..."), NULL_HOTKEY, encoding_cmd}, {' ', N_("&Encoding... C-t"), 'C', encoding_cmd},
#ifdef USE_NETCODE #ifdef USE_NETCODE
{' ', "", NULL_HOTKEY, 0}, {' ', "", NULL_HOTKEY, 0},
#ifdef WITH_MCFS #ifdef WITH_MCFS
@ -851,7 +851,7 @@ static menu_entry RightMenu[] = {
{' ', "", NULL_HOTKEY, 0}, {' ', "", NULL_HOTKEY, 0},
{' ', N_("&Filter..."), NULL_HOTKEY, filter_cmd}, {' ', N_("&Filter..."), NULL_HOTKEY, filter_cmd},
{' ', "",NULL_HOTKEY, 0}, {' ', "",NULL_HOTKEY, 0},
{' ', N_("&Encoding..."), NULL_HOTKEY, encoding_cmd}, {' ', N_("&Encoding... C-t"), 'C', encoding_cmd},
#ifdef USE_NETCODE #ifdef USE_NETCODE
{' ', "", NULL_HOTKEY, 0}, {' ', "", NULL_HOTKEY, 0},
#ifdef WITH_MCFS #ifdef WITH_MCFS

3
src/screen.c
View File

@ -2196,7 +2196,8 @@ static const panel_key_map panel_keymap [] = {
{ XCTRL('n'), move_down }, /* C-n like emacs */ { XCTRL('n'), move_down }, /* C-n like emacs */
{ XCTRL('s'), start_search }, /* C-s like emacs */ { XCTRL('s'), start_search }, /* C-s like emacs */
{ ALT('s'), start_search }, /* M-s not like emacs */ { ALT('s'), start_search }, /* M-s not like emacs */
{ XCTRL('t'), mark_file }, /* { XCTRL('t'), mark_file },*/
{ XCTRL('t'), encoding_cmd },
{ ALT('o'), chdir_other_panel }, { ALT('o'), chdir_other_panel },
{ ALT('i'), sync_other_panel }, { ALT('i'), sync_other_panel },
{ ALT('l'), chdir_to_readlink }, { ALT('l'), chdir_to_readlink },

7
src/strutil.c
View File

@ -106,14 +106,16 @@ _str_convert (GIConv coder, char *string, int size, GString * buffer)
gsize bytes_read, bytes_written; gsize bytes_read, bytes_written;
GError *error = NULL; GError *error = NULL;
errno = 0; errno = 0;
if (string == NULL || buffer == NULL) if (string == NULL || buffer == NULL)
return ESTR_FAILURE; return ESTR_FAILURE;
/*
if (! used_class.is_valid_string (string)) if (! used_class.is_valid_string (string))
{ {
return ESTR_FAILURE; return ESTR_FAILURE;
} }
*/
state = 0; state = 0;
if (size < 0) if (size < 0)
{ {
@ -208,7 +210,8 @@ _str_convert (GIConv coder, char *string, int size, GString * buffer)
{ {
if (tmp_buff != NULL) if (tmp_buff != NULL)
{ {
if (*tmp_buff){ if (*tmp_buff)
{
g_string_append (buffer, tmp_buff); g_string_append (buffer, tmp_buff);
g_free (tmp_buff); g_free (tmp_buff);
string += bytes_read; string += bytes_read;