render: Fix spanned width distribution for cells not at top or left.

[pspp] / utilities / pspp-convert.c

diff --git a/utilities/pspp-convert.c b/utilities/pspp-convert.c
index a9e075a0e75f2a154ff951a39a925b7932b3fbc0..a381a98746e6c95442f45cd42f28bb60337c0096 100644 (file)
--- a/utilities/pspp-convert.c
+++ b/utilities/pspp-convert.c
@@ -80,7 +80,7 @@ parse_variables_option (const char *arg, struct dictionary *dict,
   bool ok = parse_variables (lexer, dict, vars, n_vars, 0);
   if (ok && (lex_token (lexer) != T_STOP && lex_token (lexer) != T_ENDCMD))
     {
-      lex_error (lexer, _("expecting variable name"));
+      lex_error (lexer, _("Syntax error expecting variable name."));
       ok = false;
     }
 
@@ -232,7 +232,7 @@ main (int argc, char *argv[])
           break;
 
         case 'a':
-          for (const char *p = optarg; *p; )
+          for (const char *p = optarg; *p;)
             if (p[1] == '-' && p[2] > p[0])
               {
                 for (int ch = p[0]; ch <= p[2]; ch++)
@@ -302,7 +302,7 @@ main (int argc, char *argv[])
         goto error;
       dict_reorder_vars (dict, keep_vars, n_keep_vars);
       dict_delete_consecutive_vars (dict, n_keep_vars,
-                                    dict_get_var_cnt (dict) - n_keep_vars);
+                                    dict_get_n_vars (dict) - n_keep_vars);
       free (keep_vars);
     }