projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gui: Move null_if_empty_param() from psppire-window to helper.
[pspp]
/
src
/
language
/
utilities
/
set.q
diff --git
a/src/language/utilities/set.q
b/src/language/utilities/set.q
index 9837d2cc6bbe7d4d57c701bcfc6121df5fba054d..ce358ae8a4a7e1a21ee4f1246addd1012dbeb7c8 100644
(file)
--- a/
src/language/utilities/set.q
+++ b/
src/language/utilities/set.q
@@
-23,9
+23,9
@@
#include "data/data-in.h"
#include "data/data-out.h"
#include "data/data-in.h"
#include "data/data-out.h"
+#include "data/dataset.h"
#include "data/dictionary.h"
#include "data/format.h"
#include "data/dictionary.h"
#include "data/format.h"
-#include "data/procedure.h"
#include "data/settings.h"
#include "data/value.h"
#include "data/variable.h"
#include "data/settings.h"
#include "data/value.h"
#include "data/variable.h"
@@
-493,7
+493,10
@@
stc_custom_journal (struct lexer *lexer, struct dataset *ds UNUSED, struct cmd_s
journal_disable ();
else if (lex_is_string (lexer) || lex_token (lexer) == T_ID)
{
journal_disable ();
else if (lex_is_string (lexer) || lex_token (lexer) == T_ID)
{
- journal_set_file_name (lex_tokcstr (lexer));
+ char *filename = utf8_to_filename (lex_tokcstr (lexer));
+ journal_set_file_name (filename);
+ free (filename);
+
lex_get (lexer);
}
else
lex_get (lexer);
}
else
@@
-905,12
+908,12
@@
static struct settings *saved_settings[MAX_SAVED_SETTINGS];
static int n_saved_settings;
int
static int n_saved_settings;
int
-cmd_preserve (struct lexer *lexer, struct dataset *ds UNUSED)
+cmd_preserve (struct lexer *lexer
UNUSED
, struct dataset *ds UNUSED)
{
if (n_saved_settings < MAX_SAVED_SETTINGS)
{
saved_settings[n_saved_settings++] = settings_get ();
{
if (n_saved_settings < MAX_SAVED_SETTINGS)
{
saved_settings[n_saved_settings++] = settings_get ();
- return
lex_end_of_command (lexer)
;
+ return
CMD_SUCCESS
;
}
else
{
}
else
{
@@
-922,14
+925,14
@@
cmd_preserve (struct lexer *lexer, struct dataset *ds UNUSED)
}
int
}
int
-cmd_restore (struct lexer *lexer, struct dataset *ds UNUSED)
+cmd_restore (struct lexer *lexer
UNUSED
, struct dataset *ds UNUSED)
{
if (n_saved_settings > 0)
{
struct settings *s = saved_settings[--n_saved_settings];
settings_set (s);
settings_destroy (s);
{
if (n_saved_settings > 0)
{
struct settings *s = saved_settings[--n_saved_settings];
settings_set (s);
settings_destroy (s);
- return
lex_end_of_command (lexer)
;
+ return
CMD_SUCCESS
;
}
else
{
}
else
{