--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/07/16 23:30:08	1.74
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2006/07/22 12:36:17	1.76
@@ -62,6 +62,9 @@
    my ($self) = @_;
 
    %{$self->{completer}{command}} = ();
+
+   $self->{completer}->hide
+      if $self->{completer};
 }
 
 sub invoke_button_down {
@@ -103,8 +106,8 @@
             ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
             ["Statistics\tF2",    sub { ::toggle_player_page ($::STATS_PAGE) }],
             ["Skills\tF3",        sub { ::toggle_player_page ($::SKILL_PAGE) }],
-            ["Inventory…\tF4",    sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
-            ["Spells…\tF5",       sub { ::toggle_player_page ($::SPELL_PAGE) }],
+            ["Spells…\tF4",       sub { ::toggle_player_page ($::SPELL_PAGE) }],
+            ["Inventory…\tF5",    sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
             ["Setup… \tF9",       sub { $::SETUP_DIALOG->toggle_visibility }],
             ["Server Messages…",  sub { $::MESSAGE_WINDOW->toggle_visibility }],
             [
@@ -188,9 +191,9 @@
    } elsif ($sym == CFClient::SDLK_F3 && !$mod) {
       ::toggle_player_page ($::SKILL_PAGE);
    } elsif ($sym == CFClient::SDLK_F4 && !$mod) {
-      ::toggle_player_page ($::INVENTORY_PAGE);
-   } elsif ($sym == CFClient::SDLK_F5 && !$mod) {
       ::toggle_player_page ($::SPELL_PAGE);
+   } elsif ($sym == CFClient::SDLK_F5 && !$mod) {
+      ::toggle_player_page ($::INVENTORY_PAGE);
    } elsif ($sym == CFClient::SDLK_F9 && !$mod) {
       $::SETUP_DIALOG->toggle_visibility;
    } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
@@ -618,6 +621,8 @@
 sub hide {
    my ($self) = @_;
 
+   $self->{hist_ptr} = 0;
+
    $self->SUPER::hide;
    $self->{entry}->set_text ("");
 }