projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into import-gui
[pspp]
/
src
/
ui
/
gui
/
text-data-import-dialog.c
diff --git
a/src/ui/gui/text-data-import-dialog.c
b/src/ui/gui/text-data-import-dialog.c
index 597f65127ebdf35fcfff11ab7794573e5e6d438f..662caba809ee04e05ff12117d5e906420963a115 100644
(file)
--- a/
src/ui/gui/text-data-import-dialog.c
+++ b/
src/ui/gui/text-data-import-dialog.c
@@
-243,7
+243,6
@@
generate_syntax (const struct import_assistant *ia)
if (ia->file.encoding && strcmp (ia->file.encoding, "Auto"))
syntax_gen_pspp (&s, " /ENCODING=%sq\n", ia->file.encoding);
if (ia->file.encoding && strcmp (ia->file.encoding, "Auto"))
syntax_gen_pspp (&s, " /ENCODING=%sq\n", ia->file.encoding);
-
intro_append_syntax (ia->intro, &s);
intro_append_syntax (ia->intro, &s);
@@
-260,7
+259,7
@@
generate_syntax (const struct import_assistant *ia)
{
return sheet_spec_gen_syntax (ia);
}
{
return sheet_spec_gen_syntax (ia);
}
-
+
return ds_cstr (&s);
}
return ds_cstr (&s);
}