(cmd_data_list): Don't allow END subcommand to be used with DATA LIST

[pspp-builds.git] / src / data / sys-file-writer.c

diff --git a/src/data/sys-file-writer.c b/src/data/sys-file-writer.c
index 12b276a518cbecf4d19efd8f418ff35d14175e5a..d58fd835beaa3a8ade0d750a6909d4aed80c1d3e 100644 (file)
--- a/src/data/sys-file-writer.c
+++ b/src/data/sys-file-writer.c
@@ -238,7 +238,8 @@ sfm_open_writer (struct file_handle *fh, struct dictionary *d,
   if (write_error (w))
     goto error;
 
-  return casewriter_create (&sys_file_casewriter_class, w);
+  return casewriter_create (dict_get_next_value_idx (d),
+                            &sys_file_casewriter_class, w);
 
  error:
   close_writer (w);
@@ -547,8 +548,7 @@ write_variable_display_parameters (struct sfm_writer *w,
           int width_left = width - sfm_segment_effective_offset (width, i);
           write_int (w, measure);
           write_int (w, (i == 0 ? var_get_display_width (v)
-                         : sfm_width_to_segments (width_left) > 1 ? 32
-                         : width_left));
+                         : var_default_display_width (width_left)));
           write_int (w, alignment);
         }
     }