Document the --without-wc-funcs switch to configure, and clean up

the code to set the character set from nl_langinfo from EGE.

diff --git a/INSTALL b/INSTALL
index 99aabe746922d87ec4af405d907ded7997fff7e8..d83b81ef6ceb31b0418aa9fd347c7e6a350c760c 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -138,6 +138,19 @@ to ``configure'' to help it out, or change the default behavior:
        of the environment variables LANG, LC_ALL or LC_CTYPE is set,
        and will revert to the ISO-8859-* range if they aren't.
 
+--without-wc-funcs
+       by default Mutt uses the functions mbrtowc(), wctomb() and
+       wcwidth() provided by the system, when they are available.
+       With this option Mutt will use its own version of those
+       functions, which should work with 8-bit display charsets, UTF-8,
+       euc-jp or shift_jis, even if the system doesn't normally support
+       those multibyte charsets.
+
+       If you find Mutt is displaying non-ascii characters as octal
+       escape sequences (e.g. \243), even though you have set LANG and
+       LC_CTYPE correctly, then you might find you can solve the problem
+       with either or both of --enable-locales-fix and --without-wc-funcs.
+
 --with-exec-shell=SHELL
        on some versions of unix, /bin/sh has a bug that makes using emacs
        with mutt very difficult.  If you have the problem that whenever

diff --git a/charset.c b/charset.c
index 0f2984c9a9c3e26f112476285fd4ab436e6a2f4c..ab03225c430b87db4dcfa6e1bbc74d932edd99b1 100644 (file)
--- a/charset.c
+++ b/charset.c
@@ -204,6 +204,13 @@ void mutt_set_langinfo_charset (void)
     Charset = safe_strdup ("iso-8859-1");
 }
 
+#else
+
+void mutt_set_langinfo_charset (void)
+{
+  Charset = safe_strdup ("iso-8859-1");
+}
+
 #endif
 
 void mutt_canonical_charset (char *dest, size_t dlen, const char *name)

diff --git a/charset.h b/charset.h
index e5e6849fe50d04b32efd5197540800fcab068d74..b15ce14c9da45af15fcc3d1aa4c3a7d8a48a5561 100644 (file)
--- a/charset.h
+++ b/charset.h
@@ -32,8 +32,6 @@ FGETCONV *fgetconv_open (FILE *, const char *, const char *);
 int fgetconv (FGETCONV *);
 void fgetconv_close (FGETCONV *);
 
-#ifdef HAVE_LANGINFO_CODESET
 void mutt_set_langinfo_charset (void);
-#endif
 
 #endif /* _CHARSET_H */

diff --git a/init.c b/init.c
index c744ff2663d50ffca0989f12ba7cce624cc38bd1..8390441ab08d4205663f706bb21360f8a5d9c66e 100644 (file)
--- a/init.c
+++ b/init.c
@@ -1809,12 +1809,7 @@ void mutt_init (int skip_sys_rc, LIST *commands)
     FREE (&token.data);
   }
 
-#ifdef HAVE_LANGINFO_CODESET
   mutt_set_langinfo_charset ();
-#else
-  Charset = safe_strdup ("iso-8859-1");
-#endif
-
   mutt_set_charset (Charset);