From 1ee8f8fb459299d25f75f621467f70d96293603d Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sat, 2 Dec 2000 19:05:03 +0000 Subject: [PATCH] nl_langinfo() didn't work like i thought - fixed :) git-svn-id: http://svn.irssi.org/repos/irssi/trunk@920 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/fe-common/core/fe-settings.c | 2 +- src/nls.h | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/fe-common/core/fe-settings.c b/src/fe-common/core/fe-settings.c index 5a7b2b64..59dbdbba 100644 --- a/src/fe-common/core/fe-settings.c +++ b/src/fe-common/core/fe-settings.c @@ -256,7 +256,7 @@ static void settings_save_fe(const char *fname) static void settings_save_confirm(const char *line, char *fname) { - if (toupper(*line) == nl_langinfo(YESEXPR)) + if (regexp_match(line, nl_langinfo(YESEXPR)) settings_save_fe(fname); g_free(fname); } diff --git a/src/nls.h b/src/nls.h index c01f8e60..fe6ed0e5 100644 --- a/src/nls.h +++ b/src/nls.h @@ -1,20 +1,25 @@ #ifdef ENABLE_NLS + # ifdef HAVE_LIBINTL_H # include # else # include "../intl/libgettext.h" # endif + # define _(String) gettext (String) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else # define N_(String) (String) # endif + # ifdef HAVE_LANGINFO_H # include # else # define nl_langinfo(x) x -# define YESEXPR 'Y' +# endif +# ifndef YESEXPR +# define YESEXPR "^[yY]" # endif #else /* Stubs that do something close enough. */