Merge remote branches 'avuton/master' and 'jn/dev'

diff --cc configure.ac
index 4e85b10ecdd92d302a7455fae47d3e7c00199da5,32440ea0cdb4cbd2ad8e725112a62eb9f5d4b3a1..b087c35b4b9ae1c70fa2486d6213a7f8155c12df
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -315,9 -343,10 +315,10 @@@ AM_CONDITIONAL(ENABLE_SCREEN_TEXT, tes
  dnl Optional screen - outputs
  AC_MSG_CHECKING([whether to include the outputs screen])
  AC_ARG_ENABLE([outputs-screen],
 -      AC_HELP_STRING([--enable-outputs-screen],
 +      AS_HELP_STRING([--enable-outputs-screen],
                [Enable outputs screen @<:@default=yes@:>@]),,
        [enable_outputs_screen=$disable_mini])
+ AC_MSG_RESULT([$enable_outputs_screen])
  if test "x$enable_outputs_screen" = "xyes" ; then
        AC_DEFINE(ENABLE_OUTPUTS_SCREEN, 1, [Enable outputs screen])
  fi

diff --cc src/main.c
Simple merge

diff --cc src/options.c
Simple merge

diff --cc src/screen.c
index 64c704b4902ebc8589c8ffb3962c1078926be215,315306061b66f86d2d3d9a6826f32cba224c2b12..fdc168adb5efc3869e65425e6579a3d6d8cd4c8a
--- 1/src/screen.c
--- 2/src/screen.c
+++ b/src/screen.c
@@@ -202,14 -202,11 +202,14 @@@ screen_resize(struct mpdclient *c
  {
        if (COLS<SCREEN_MIN_COLS || LINES<SCREEN_MIN_ROWS) {
                screen_exit();
-               fprintf(stderr, "%s", _("Error: Screen too small"));
+               fprintf(stderr, "%s\n", _("Error: Screen too small"));
                exit(EXIT_FAILURE);
        }
 -
 +#ifdef PDCURSES
 +      resize_term(LINES, COLS);
 +#else 
        resizeterm(LINES, COLS);
 +#endif
  
        screen.cols = COLS;
        screen.rows = LINES;