root/trunk/texinfo/texinfo-4.9-multibyte-1.patch

texinfo-4.8/info/info.c

@@ -154 +154 @@
-#ifdef HAVE_SETLOCALE
-  /* Set locale via LC_ALL.  */
-  setlocale (LC_ALL, "");
+  /* But don't use translated messages in the case when
+     string width and length can differ */
+  if (MB_CUR_MAX > 1)
+    setlocale(LC_MESSAGES, "C");
-#endif
-
-#ifdef ENABLE_NLS

texinfo-4.8/info/man.c

@@ -325 +325 @@
-      freopen (NULL_DEVICE, "r", stdin);
-      dup2 (pipes[1], fileno (stdout));
-
+      if (MB_CUR_MAX > 1)
+        {
+          /* Info has trouble wrapping man output if it contains
+             multibyte characters */
+          setenv("LANGUAGE", "C", 1);
+          setenv("LANG", "C", 1);
+          setenv("LC_MESSAGES", "C", 1);
+          setenv("LC_CTYPE", "C", 1);
+          setenv("LC_ALL", "C", 1);
+        }
+
-      execv (formatter_args[0], formatter_args);
-
-      /* If we get here, we couldn't exec, so close out the pipe and