Fix error messages and comment.

diff --git a/src/data/ChangeLog b/src/data/ChangeLog
index be7cf4419303fc99d62f55c601c7a7297dd62ec4..cc5573549f5a6f314f3371c715cb11864ebd6263 100644 (file)
--- a/src/data/ChangeLog
+++ b/src/data/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct 31 18:09:24 2006  Ben Pfaff  <blp@gnu.org>
+
+       * data-in.c (parse_trailer): Fix error message.
+
 Sat Oct 28 11:56:50 2006  Ben Pfaff  <blp@gnu.org>
 
        * format.c (fmt_is_binary): New function.

diff --git a/src/data/data-in.c b/src/data/data-in.c
index 8a62d8fc76a0bfec26e283e76a09d43dca2d9a03..c5556a3c78694d0b939547d82ba0c812231be661 100644 (file)
--- a/src/data/data-in.c
+++ b/src/data/data-in.c
@@ -835,7 +835,8 @@ parse_trailer (struct data_in *i)
   if (!have_char (i))
     return true;
   
-  dls_error (i, _("Trailing garbage \"%s\" following date."), i->s);
+  dls_error (i, _("Trailing garbage \"%.*s\" following date."),
+             (int) (i->e - i->s), i->s);
   return false;
 }
 

diff --git a/src/language/lexer/ChangeLog b/src/language/lexer/ChangeLog
index cee1fd94caf420d647514ea4339762ff142c303f..29678623cd52e36385d092212624dcae51f5e17c 100644 (file)
--- a/src/language/lexer/ChangeLog
+++ b/src/language/lexer/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct 31 18:09:32 2006  Ben Pfaff  <blp@gnu.org>
+
+       * range-parser.c (parse_number): Fix error message.
+
 Sat Oct 28 16:17:18 WST 2006 John Darrington <john@darrington.wattle.id.au>
 
        * lexer.c lexer.h: Added a line_buffer (previously an external

diff --git a/src/language/lexer/range-parser.c b/src/language/lexer/range-parser.c
index 334987a3e611d41151ca9cb0bb1f3cf484a9d2e4..2934bc8bd63219fce9a885bd55e97f293cc60c26 100644 (file)
--- a/src/language/lexer/range-parser.c
+++ b/src/language/lexer/range-parser.c
@@ -95,7 +95,7 @@ parse_number (double *x, const struct fmt_spec *f)
       *x = v.f;
       if (*x == SYSMIS)
         {
-          lex_error (_("System-missing value is not valid here."));
+          msg (SE, _("System-missing value is not valid here."));
           return false;
         }
       return true;

diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q
index d5b84a71317a11625178ed3dc9bea0edb46a444d..a7e6e2f0f3007e2faaf1c100299d8057d7af05e3 100644 (file)
--- a/src/language/utilities/set.q
+++ b/src/language/utilities/set.q
@@ -209,7 +209,7 @@ find_cc_separators (const char *cc_string, struct custom_currency *cc)
   int comma_cnt, dot_cnt;
   
   /* Count commas and periods.  There must be exactly three of
-     one or the other, except that an apostrophe acts escapes a
+     one or the other, except that an apostrophe escapes a
      following comma or period. */
   comma_cnt = dot_cnt = 0;
   for (sp = cc_string; *sp; sp++)