Merge branch 'master' into resize

diff --cc src/curses/ux_init.c
index f930769367ba32fe474df9ca0bf0347029c289c2,6e6057fd883d5b8b73fccc8e719073d8ef0a1752..09fea504d84dbca107e60c9a250d6a9a3c614fec
--- 1/src/curses/ux_init.c
--- 2/src/curses/ux_init.c
+++ b/src/curses/ux_init.c
@@@ -45,19 -45,6 +45,9 @@@
  #include "ux_frotz.h"
  #include "ux_blorb.h"
  
- f_setup_t f_setup;
- u_setup_t u_setup;
- 
 +volatile sig_atomic_t terminal_resized = 0;
 +
- static int getconfig(char *);
- static int geterrmode(char *);
- static int getcolor(char *);
- static int getbool(char *);
- 
 +static void sigwinch_handler(int);
- static void sigint_handler(int);
- 
  #define INFORMATION "\
  An interpreter for all Infocom and other Z-Machine games.\n\
  \n\