From: John Darrington <john@darrington.wattle.id.au>
Date: Tue, 18 Mar 2008 08:08:12 +0000 (+0000)
Subject: Fixed bug #21801
X-Git-Tag: v0.6.0~51
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1e28f93006b3151c30c6f5e77d88f177960e6d4;p=pspp-builds.git

Fixed bug #21801
---

diff --git a/src/data/ChangeLog b/src/data/ChangeLog
index 75313fee..064108a4 100644
--- a/src/data/ChangeLog
+++ b/src/data/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-18  John Darrington <john@darrington.wattle.id.au>
+
+	* data-in.c: If category is custom currency, then use
+	numeric format for input.
+
 2008-03-06  Ben Pfaff  <blp@gnu.org>
 
 	* dictionary.c (var_name_is_insertable): New function.
diff --git a/src/data/data-in.c b/src/data/data-in.c
index cde7c07f..28d6da2a 100644
--- a/src/data/data-in.c
+++ b/src/data/data-in.c
@@ -171,7 +171,10 @@ parse_number (struct data_in *i)
   int save_errno;
   char *tail;
 
-  assert (fmt_get_category (i->format) != FMT_CAT_CUSTOM);
+  if  (fmt_get_category (i->format) == FMT_CAT_CUSTOM)
+    {
+      style = settings_get_style (FMT_F);
+    }
 
   /* Trim spaces and check for missing value representation. */
   if (trim_spaces_and_check_missing (i))