Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite...

Conflicts:

	src/ui/gui/psppire-var-store.h

diff --cc src/ui/gui/psppire-var-store.c
Simple merge

diff --cc src/ui/gui/psppire-var-store.h
index 7ef186a0a1b06067f22dbb6899866558a91ee97a,160812ca9a1c72236f38ace5898b3c677d6cd6da..cf4375898f737fd782196c51cf7143cc8334b4d4
--- 1/src/ui/gui/psppire-var-store.h
--- 2/src/ui/gui/psppire-var-store.h
+++ b/src/ui/gui/psppire-var-store.h
@@@ -65,7 -65,7 +65,6 @@@ struct _PsppireVarStor
    /*< private >*/
    PsppireDict *dict;
    GdkColor disabled;
-   const PangoFontDescription *font_desc;
 -  gint trailing_rows;
    PsppireVarStoreFormatType format_type;
  };