Fix 2305.

diff --git a/main.c b/main.c
index 0d9d113dcfdb6c09a8dad199ec084a072b6c758e..0ac2f00132f1c3c9a5d358b084c6fea0d9f6d564 100644 (file)
--- a/main.c
+++ b/main.c
@@ -484,6 +484,9 @@ static void start_curses (void)
   SLtt_Ignore_Beep = 1; /* don't do that #*$@^! annoying visual beep! */
   SLsmg_Display_Eight_Bit = 128; /* characters above this are printable */
   SLtt_set_color(0, NULL, "default", "default");
+#if SLANG_VERSION >= 20000
+  SLutf8_enable(-1);
+#endif
 #else
   /* should come before initscr() so that ncurses 4.2 doesn't try to install
      its own SIGWINCH handler */

diff --git a/mutt_curses.h b/mutt_curses.h
index a1a2ad22fd392ee80ae1fbd85bd8b9d7b8a06f46..8ee3d45a2d3abc7a66e446a64823be596c206820 100644 (file)
--- a/mutt_curses.h
+++ b/mutt_curses.h
@@ -26,7 +26,9 @@
 #define unix
 #endif /* unix */
 
-#include "slcurses.h"
+#include <slang.h>     /* in addition to slcurses.h, we need slang.h for the version
+                          number to test for 2.x having UTF-8 support in main.c */
+#include <slcurses.h>
 
 #define KEY_DC SL_KEY_DELETE
 #define KEY_IC SL_KEY_IC