X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurs_lib.c;h=71be0119aa3b7bc5e5df2797458f3baf3c5e42a4;hp=7562ad89ac292c15c73427336e10a0a927746d31;hb=d4b790a79307b4f53c49f4c25223977a8baa6aa1;hpb=eab38ff6950a0075741f24ac9fb0d9eaf7df8671

diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c
index 7562ad8..71be011 100644
--- a/lib-ui/curs_lib.c
+++ b/lib-ui/curs_lib.c
@@ -14,9 +14,7 @@
 #include <lib-lib/lib-lib.h>
 
 #include <termios.h>
-#ifdef HAVE_LANGINFO_YESEXPR
 #include <langinfo.h>
-#endif
 
 #include <lib-lua/lib-lua.h>
 #include <lib-sys/unix.h>
@@ -158,8 +156,6 @@ int mutt_yesorno (const char *msg, int def)
   char *no = _("no");
   char *answer_string;
   ssize_t answer_string_len;
-
-#ifdef HAVE_LANGINFO_YESEXPR
   char *expr;
   regex_t reyes;
   regex_t reno;
@@ -173,7 +169,6 @@ int mutt_yesorno (const char *msg, int def)
     !regcomp (&reyes, expr, REG_NOSUB | REG_EXTENDED);
   reno_ok = (expr = nl_langinfo (NOEXPR)) && expr[0] == '^' &&
     !regcomp (&reno, expr, REG_NOSUB | REG_EXTENDED);
-#endif
 
   CLEARLINE (LINES - 1);
 
@@ -200,20 +195,14 @@ int mutt_yesorno (const char *msg, int def)
       break;
     }
 
-#ifdef HAVE_LANGINFO_YESEXPR
     answer[0] = ch.ch;
     if (reyes_ok ? (regexec (&reyes, answer, 0, 0, 0) == 0) : tolower (ch.ch) == *yes)
-#else
-    if (tolower (ch.ch) == *yes)
-#endif
     {
       def = M_YES;
       break;
     }
     else if (
-#ifdef HAVE_LANGINFO_YESEXPR
               reno_ok ? (regexec (&reno, answer, 0, 0, 0) == 0) :
-#endif
               (tolower (ch.ch) == *no)) {
       def = M_NO;
       break;
@@ -222,12 +211,10 @@ int mutt_yesorno (const char *msg, int def)
     }
   }
 
-#ifdef HAVE_LANGINFO_YESEXPR
   if (reyes_ok)
     regfree (&reyes);
   if (reno_ok)
     regfree (&reno);
-#endif
 
   if (def != -1) {
     addstr ((char *) (def == M_YES ? yes : no));