--- rxvt-unicode/src/rxvtfont.h	2006/02/18 14:14:43	1.21
+++ rxvt-unicode/src/rxvtfont.h	2007/10/18 09:11:43	1.24
@@ -6,19 +6,6 @@
 # include <X11/Xft/Xft.h>
 #endif
 
-#ifdef HAVE_XSETLOCALE
-# define X_LOCALE
-# include <X11/Xlocale.h>
-#else
-# ifdef HAVE_SETLOCALE
-#  include <clocale>
-# endif
-#endif				/* HAVE_XLOCALE */
-
-#ifdef HAVE_NL_LANGINFO
-# include <langinfo.h>
-#endif
-
 #include <inttypes.h>
 
 #include "feature.h"
@@ -62,7 +49,7 @@
 
   virtual rxvt_fontprop properties () = 0;
 
-  virtual bool load (const rxvt_fontprop &morph) = 0;
+  virtual bool load (const rxvt_fontprop &morph, bool force_prop) = 0;
   virtual bool has_char (uint32_t unicode, const rxvt_fontprop *prop, bool &careful) const = 0;
 
   virtual void draw (rxvt_drawable &d,
@@ -82,7 +69,7 @@
   ~rxvt_fontset ();
 
   bool populate (const char *desc);
-  void set_prop (const rxvt_fontprop &prop) { this->prop = prop; }
+  void set_prop (const rxvt_fontprop &prop, bool force_prop) { this->prop = prop; this->force_prop = force_prop; }
   int find_font (uint32_t unicode);
   int find_font (const char *name) const;
   bool realize_font (int i);
@@ -96,6 +83,7 @@
 private:
   rxvt_term *term;
   rxvt_fontprop prop;
+  bool force_prop;
   simplevec<rxvt_font *> fonts;
   const rxvt_fallback_font *fallback;