From: John Darrington <john@darrington.wattle.id.au>
Date: Wed, 16 Dec 2009 20:09:55 +0000 (+0100)
Subject: Merge commit 'origin/stable'
X-Git-Tag: fc11-i386-build58^0
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=commitdiff_plain;h=3bbb4370239deb29ebbf813d258aef6249e2a431

Merge commit 'origin/stable'

Conflicts:

	NEWS
	configure.ac
	po/nl.po
	src/ui/gui/dict-display.c
---

3bbb4370239deb29ebbf813d258aef6249e2a431
diff --cc NEWS
index 1aac688c,f99fb173..149d1dea
--- a/NEWS
+++ b/NEWS
@@@ -5,57 -5,7 +5,56 @@@ See the end for copying conditions
  
  Please send PSPP bug reports to bug-gnu-pspp@gnu.org.
  
 -Changes from 0.6.1 to 0.6.2-rc1:
 +Changes from 0.7.1 to 0.7.2:
 +
 + * Updated Perl module interface.
 +
 + * Value labels for long string variables are now supported.
 +
 + * Missing values for long string variables are now supported.
 +
 +Changes from 0.7.0 to 0.7.1:
 +
 + *  Added a perl module to facilitate reading and writing of pspp system 
 +    files from perl programs.
 +
 +Changes from 0.6.2-pre6 to 0.7.0:
 +
 +  * Custom variable and data file attributes are now supported.
 +    Commands VARIABLE ATTRIBUTE and DATAFILE ATTRIBUTE have been added
 +    for setting and clear attributes.  Support for attributes has also
 +    been added to commands that read and write system files, such as
 +    SAVE and GET, as well as to the DISPLAY command.
 +
 +  * Numererous improvements to the Graphical User Interface have
 +    made.  Notable improvements include:
 +
 +    - Non-Ascii characters in strings, labels and variable names are
 +      now supported.
 +
 +    - A "Split Window" function is available, which makes it easier to
 +      see different parts of a large data file.
 +
 +    - Data files can now be opened by specifing their name as the first
 +      argument.  This means that on a properly configured desktop, double
 +      clicking on an icon will open the file.
 +    
 +
 +  * New statistical procedures:
 +    - CORRELATIONS
 +    - ROC
 +    - RELIABILITY
 +
 +    NPAR TESTS now supports the WILCOXON and SIGN subcommands.
 +
 +    The CROSSTABS command has been completely re-implemented to fix numerous bugs.
 +
 +  * Three new commands to combine data files have been added: MATCH FILES,
 +   UPDATE and  ADD FILES.
 +
 +  * A tutorial chapter has been added to the user manual.
 +
- 
- Changes from 0.6.1 to 0.6.2-pre6:
++Changes from 0.6.1 to 0.6.2
  
    * New translations:
  
diff --cc src/data/sys-file-reader.c
index b024e4f0,8d973e4d..f63a122f
--- a/src/data/sys-file-reader.c
+++ b/src/data/sys-file-reader.c
@@@ -1729,9 -1402,10 +1738,10 @@@ read_compressed_number (struct sfm_read
     Returns true if successful, false if end of file is
     reached immediately. */
  static bool
 -read_compressed_string (struct sfm_reader *r, char *dst)
 +read_compressed_string (struct sfm_reader *r, uint8_t *dst)
  {
-   switch (read_opcode (r))
+   int opcode = read_opcode (r);
+   switch (opcode)
      {
      case -1:
      case 252: