Thu Sep 6 15:16:05 2001 Michael Jennings (mej)

Argh.  I hate finding stuff like this after a release.  Luckily, it's
not severe.  It only occurs when --default-font-index is specified on
the command line.  Symptoms vary according to how the compiler
arranges certain variables in memory.

Thanks to Richard Lowe <richlowe@richlowe.net> for reporting the
problem.


SVN revision: 5337

3 files changed, 14 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index ae4a766..a5b2174 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4376,3 +4376,13 @@ Tue Aug 28 00:30:55 2001                        Michael Jennings (mej)
 
 Let's see if this fixes the PrintScreen problems....
 ----------------------------------------------------------------------
+Thu Sep  6 15:16:05 2001                        Michael Jennings (mej)
+
+Argh.  I hate finding stuff like this after a release.  Luckily, it's
+not severe.  It only occurs when --default-font-index is specified on
+the command line.  Symptoms vary according to how the compiler
+arranges certain variables in memory.
+
+Thanks to Richard Lowe <richlowe@richlowe.net> for reporting the
+problem.
+----------------------------------------------------------------------
diff --git a/src/font.c b/src/font.c
index 0ce0878..85ec255 100644
--- a/src/font.c
+++ b/src/font.c
@@ -41,7 +41,8 @@ static const char cvs_ident[] = "$Id$";
 #include "windows.h"
 
 char **etfonts = NULL;
-unsigned char font_idx = DEF_FONT_IDX, def_font_idx = DEF_FONT_IDX, font_cnt = 0;
+unsigned char font_idx = DEF_FONT_IDX, font_cnt = 0;
+int def_font_idx = DEF_FONT_IDX;
 char *rs_font[NFONTS];
 #ifdef MULTI_CHARSET
 char *rs_mfont[NFONTS];
diff --git a/src/font.h b/src/font.h
index f800f89..cccefc9 100644
--- a/src/font.h
+++ b/src/font.h
@@ -73,7 +73,8 @@ typedef struct fontshadow_struct {
 } fontshadow_t;
 
 /************ Variables ************/
-extern unsigned char font_idx, def_font_idx, font_cnt, font_chg;
+extern unsigned char font_idx, font_cnt, font_chg;
+extern int def_font_idx;
 extern const char *def_fontName[];
 extern char *rs_font[NFONTS];
 extern char **etfonts, **etmfonts;