Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfi...

diff --combined Documentation/kbuild/kconfig.txt
index e349f29,d58a2ea..8ef6dbb
--- 1/Documentation/kbuild/kconfig.txt
--- 2/Documentation/kbuild/kconfig.txt
+++ b/Documentation/kbuild/kconfig.txt
@@@ -165,7 -165,7 +165,7 @@@ Searching in menuconfig
        Example:
                /hotplug
                This lists all config symbols that contain "hotplug",
 -              e.g., HOTPLUG, HOTPLUG_CPU, MEMORY_HOTPLUG.
 +              e.g., HOTPLUG_CPU, MEMORY_HOTPLUG.
  
        For search help, enter / followed TAB-TAB-TAB (to highlight
        <Help>) and Enter.  This will tell you that you can also use
@@@ -175,11 -175,9 +175,9 @@@
                /^hotplug
  
        When searching, symbols are sorted thus:
-         - exact match first: an exact match is when the search matches
-           the complete symbol name;
-         - alphabetical order: when two symbols do not match exactly,
-           they are sorted in alphabetical order (in the user's current
-           locale).
+         - first, exact matches, sorted alphabetically (an exact match
+           is when the search matches the complete symbol name);
+         - then, other matches, sorted alphabetically.
        For example: ^ATH.K matches:
            ATH5K ATH9K ATH5K_AHB ATH5K_DEBUG [...] ATH6KL ATH6KL_DEBUG
            [...] ATH9K_AHB ATH9K_BTCOEX_SUPPORT ATH9K_COMMON [...]

diff --combined scripts/kconfig/mconf.c
index 6c9c45f,b20e851..2c39631
--- 1/scripts/kconfig/mconf.c
--- 2/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@@ -401,8 -401,8 +401,8 @@@ static void search_conf(void
        struct subtitle_part stpart;
  
        title = str_new();
-       str_printf( &title, _("Enter %s (sub)string or regexp to search for "
-                             "(with or without \"%s\")"), CONFIG_, CONFIG_);
+       str_printf( &title, _("Enter (sub)string or regexp to search for "
+                             "(with or without \"%s\")"), CONFIG_);
  
  again:
        dialog_clear();
@@@ -671,12 -671,11 +671,12 @@@ static void conf(struct menu *menu, str
                                  active_menu, &s_scroll);
                if (res == 1 || res == KEY_ESC || res == -ERRDISPLAYTOOSMALL)
                        break;
 -              if (!item_activate_selected())
 -                      continue;
 -              if (!item_tag())
 -                      continue;
 -
 +              if (item_count() != 0) {
 +                      if (!item_activate_selected())
 +                              continue;
 +                      if (!item_tag())
 +                              continue;
 +              }
                submenu = item_data();
                active_menu = item_data();
                if (submenu)