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

diff --git a/doc/utilities.texi b/doc/utilities.texi
index cfbafccb223de06cc47737f096ee05f1dc0ea82c..158177b6884f6435e006099722643f66e5082e5b 100644 (file)
--- a/doc/utilities.texi
+++ b/doc/utilities.texi
@@ -606,7 +606,7 @@ RANDOM, which will obtain an initial seed from the current time of day.
 Currently not used.
 
 @item WORKSPACE
-The maximum amount of memory that @pspp{} will use to store data being processed.
+The maximum amount of memory (in kilobytes) that @pspp{} will use to store data being processed.
 If memory in excess of the workspace size is required, then @pspp{} will start
 to use temporary files to store the data.
 Setting a higher value will, in general, mean procedures will run faster, 

diff --git a/src/data/settings.c b/src/data/settings.c
index 47b3f3d5ce6081f58f53afe03a2f1bd1fd381904..b1d4a80b9d2773b798fe432e2731aa215979865d 100644 (file)
--- a/src/data/settings.c
+++ b/src/data/settings.c
@@ -452,7 +452,7 @@ settings_get_workspace_cases (const struct caseproto *proto)
    bytes. */
 
 void
-settings_set_workspace ( size_t workspace)
+settings_set_workspace (size_t workspace)
 {
   the_settings.workspace = workspace;
 }

diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q
index e6e816a8b79ea57cfc5b21c4057efdbb458ac872..9a7e841707f535076bf1ad0126f454dd17aa1ba8 100644 (file)
--- a/src/language/utilities/set.q
+++ b/src/language/utilities/set.q
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -872,6 +872,13 @@ show_width (const struct dataset *ds UNUSED)
   return xasprintf ("%d", settings_get_viewwidth ());
 }
 
+static char *
+show_workspace (const struct dataset *ds UNUSED)
+{
+  size_t ws = settings_get_workspace () / 1024L;
+  return xasprintf ("%zu", ws);
+}
+
 static char *
 show_current_directory (const struct dataset *ds UNUSED)
 {
@@ -963,6 +970,7 @@ const struct show_sbc show_table[] =
     {"WIB", show_wib},
     {"WRB", show_wrb},
     {"WIDTH", show_width},
+    {"WORKSPACE", show_workspace},
   };
 
 static void