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

* removed edit/usermap.c edit/usermap.h

Browse Source 
Signed-off-by: Ilia Maslakov <il.smind@google.com>
This commit is contained in:
Ilia Maslakov 2009-09-10 15:21:08 +00:00
parent e6ca2f2fbb
commit d57452c10c
6 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
edit/Makefile.am
View File

@ -9,7 +9,7 @@ endif
libedit_a_SOURCES = \
bookmark.c edit.c editcmd.c editwidget.c editdraw.c editkeys.c \
editmenu.c editoptions.c editcmddef.h edit-impl.h edit.h edit-widget.h \
editlock.c editlock.h syntax.c usermap.h usermap.c wordproc.c \
editlock.c editlock.h syntax.c wordproc.c \
choosesyntax.c etags.c etags.h editcmd_dialogs.c editcmd_dialogs.h
EXTRA_DIST =

1
edit/edit.c
View File

@ -45,7 +45,6 @@
#include "editlock.h"
#include "edit-widget.h"
#include "../src/cmddef.h"
#include "usermap.h"
#include "../src/tty/color.h" /* EDITOR_NORMAL_COLOR */
#include "../src/tty/tty.h" /* attrset() */

3
edit/editoptions.c
View File

@ -34,7 +34,6 @@
#include "../src/global.h"
#include "edit-impl.h"
#include "usermap.h"
#include "../src/dialog.h" /* B_CANCEL */
#include "../src/wtools.h" /* QuickDialog */
@ -177,6 +176,4 @@ edit_options_dialog (void)
/* Load or unload syntax rules if the option has changed */
if (option_syntax_highlighting != old_syntax_hl)
edit_load_syntax (wedit, NULL, option_syntax_type);
/* Load usermap if it's needed */
edit_load_user_map (wedit);
}

10
src/keybind.c
View File

@ -295,7 +295,6 @@ keymap_add(GArray *keymap, int key, int cmd)
{
global_key_map_t new_one, *map;
guint i;
map = &(g_array_index(keymap, global_key_map_t, 0));
for (i = 0; i < keymap->len; i++) {
@ -304,10 +303,11 @@ keymap_add(GArray *keymap, int key, int cmd)
return;
}
}
new_one.key = key;
new_one.command = cmd;
g_array_append_val(keymap, new_one);
if (key !=0 && cmd !=0) {
new_one.key = key;
new_one.command = cmd;
g_array_append_val(keymap, new_one);
}
}

9
src/main.c
View File

@ -1853,18 +1853,17 @@ do_nc (void)
check_codeset();
main_map = default_main_map;
if (main_keymap && main_keymap->len > 0)
main_map = (global_key_map_t *) main_keymap->data;
if (main_keymap && main_keymap->len > 0)
main_map = (global_key_map_t *) main_keymap->data;
main_x_map = default_main_x_map;
if (main_x_keymap && main_x_keymap->len > 0)
main_x_map = (global_key_map_t *) main_x_keymap->data;
if (main_x_keymap && main_x_keymap->len > 0)
main_x_map = (global_key_map_t *) main_x_keymap->data;
panel_map = default_panel_keymap;
if (panel_keymap && panel_keymap->len > 0) {
mc_log ("panel_keymap && panel_keymap->len > 0\n");
panel_map = (global_key_map_t *) panel_keymap->data;
}

1
src/setup.c
View File

@ -857,6 +857,7 @@ load_keymap_defs (void)
panel_keymap = g_array_new(TRUE, FALSE, sizeof(global_key_map_t));
load_keymap_from_section ("panel", panel_keymap, mc_global_keymap);
mc_config_deinit(mc_global_keymap);
}