Merge branch 'master' of git://git.musicpd.org/patrick/ncmpc

diff --combined src/options.c
index 24c4ae5dd083174ad780184e2fca8aa1aa0cf262,3e862d2a8d9f2c425d212b3294150a67aca202f8..df1a9da16fff6fca44da8dc780a4155763a18a7d
--- 1/src/options.c
--- 2/src/options.c
+++ b/src/options.c
@@@ -1,7 -1,7 +1,7 @@@
  /* ncmpc (Ncurses MPD Client)
   * (c) 2004-2009 The Music Player Daemon Project
   * Project homepage: http://musicpd.org
 - 
 +
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
   * the Free Software Foundation; either version 2 of the License, or
@@@ -64,6 -64,7 +64,7 @@@ options_t options = 
        .scroll = DEFAULT_SCROLL,
        .welcome_screen_list = true,
        .display_time = true,
+       .jump_prefix_only = true,
  #endif
  };
  
@@@ -150,6 -151,7 +151,6 @@@ display_help(void
                       option_table[i].shortopt,
                       tmp,
                       option_table[i].descrition);
 -              i++;
        }
  }
  
@@@ -272,11 -274,13 +273,13 @@@ handle_option(int c, const char *arg
                /* the splash screen was removed */
                break;
  #ifndef NDEBUG
+ #ifndef NCMPC_MINI
        case 'K': /* --dump-keys */
                read_configuration();
                write_key_bindings(stdout, KEYDEF_WRITE_ALL | KEYDEF_COMMENT_ALL);
                exit(EXIT_SUCCESS);
                break;
+ #endif
  #endif
        default:
                fprintf(stderr,"Unknown Option %c = %s\n", c, arg);

diff --combined src/screen_help.c
index 540fc94ba3c1b22881b8fda507a24e67b3b1126d,bf7411c5c854c6155a1b06143554b38cc4d2be1c..aaa4ff8c740e78c90855ce6bca71781a3aeeef9f
--- 1/src/screen_help.c
--- 2/src/screen_help.c
+++ b/src/screen_help.c
@@@ -90,7 -90,6 +90,7 @@@ static help_text_row_t help_text[] = 
        { 0, CMD_REPEAT, NULL },
        { 0, CMD_RANDOM, NULL },
        { 0, CMD_SINGLE, NULL },
 +      { 0, CMD_CONSUME, NULL },
        { 0, CMD_CROSSFADE, NULL },
        { 0, CMD_SHUFFLE, NULL },
        { 0, CMD_DB_UPDATE, NULL },
@@@ -259,7 -258,7 +259,7 @@@ help_cmd(G_GNUC_UNUSED mpdclient_t *c, 
                return true;
        }
  
-       lw->selected = lw->start+lw->rows;
+       lw->selected = lw->start;
        if (screen_find(lw,  help_text_rows,
                        cmd, list_callback, NULL)) {
                /* center the row */