From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 23 Mar 2013 16:10:25 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into import-gui
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=504ee72af2e3f4df358ca45b8acb847affdb85cb;p=pspp

Merge remote branch 'origin/master' into import-gui

Conflicts:
	src/ui/gui/automake.mk
	src/ui/gui/page-assistant.c
	src/ui/gui/page-file.c
	src/ui/gui/text-data-import-dialog.c
---

504ee72af2e3f4df358ca45b8acb847affdb85cb
diff --cc src/ui/gui/text-data-import-dialog.c
index 597f65127e,d535734d08..662caba809
--- a/src/ui/gui/text-data-import-dialog.c
+++ b/src/ui/gui/text-data-import-dialog.c
@@@ -243,7 -232,7 +243,6 @@@ generate_syntax (const struct import_as
        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);
  
  
@@@ -256,11 -245,7 +255,11 @@@
        formats_append_syntax (ia, &s);
        apply_dict (ia->dict, &s);
      }
 -
 +  else
 +    {
 +      return sheet_spec_gen_syntax (ia);
 +    }
- 
++  
    return ds_cstr (&s);
  }