From: Max Kellermann <max@duempel.org>
Date: Thu, 3 Nov 2011 16:42:07 +0000 (+0100)
Subject: Merge remote branches 'avuton/master' and 'jn/dev'
X-Git-Tag: release-0.20~60
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3bd95ba62353144987b8008435045b07d2307dd1;p=ncmpc.git

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

3bd95ba62353144987b8008435045b07d2307dd1
diff --cc configure.ac
index 4e85b10,32440ea..b087c35
--- a/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/screen.c
index 64c704b,3153060..fdc168a
--- a/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;