From: John Darrington <john@darrington.wattle.id.au>
Date: Fri, 12 Dec 2003 08:32:08 +0000 (+0000)
Subject: Put back a bug fix which accidently got reverted.
X-Git-Tag: v0.4.0~466
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaf83d4cae00ae2e2ccccc3c02d5262330a31c8a;p=pspp-builds.git

Put back a bug fix which accidently got reverted.
---

diff --git a/src/glob.c b/src/glob.c
index 235399c0..b7ec50a3 100644
--- a/src/glob.c
+++ b/src/glob.c
@@ -133,9 +133,7 @@ init_glob (int argc unused, char **argv)
 {
   /* FIXME: Allow i18n of other locale items (besides LC_MESSAGES). */
 #if ENABLE_NLS
-#if LC_MESSAGE
   setlocale (LC_MESSAGES, "");
-#endif
   setlocale (LC_MONETARY, "");
   bindtextdomain (PACKAGE, locale_dir);
   textdomain (PACKAGE);
diff --git a/src/output.c b/src/output.c
index 8cf5bafa..86e8534c 100644
--- a/src/output.c
+++ b/src/output.c
@@ -287,6 +287,8 @@ outp_read_devices (void)
   where.line_number = 0;
   err_push_file_locator (&where);
 
+  ds_init (NULL, &line, 128);
+
   if (init_fn == NULL)
     {
       msg (IE, _("Cannot find output initialization file.  Use `-vv' to view "
@@ -302,7 +304,6 @@ outp_read_devices (void)
       goto exit;
     }
 
-  ds_init (NULL, &line, 128);
   for (;;)
     {
       char *cp;