*** empty log message ***

diff --git a/src/defaultfont.C b/src/defaultfont.C
index 2566c029fae394f9077e69e51ee5ab967c9a4950..3ccc98d8c4eddea114e7d38e89e63c00c6b5ae5e 100644 (file)
--- a/src/defaultfont.C
+++ b/src/defaultfont.C
@@ -285,7 +285,7 @@ struct rxvt_font_default : rxvt_font {
         && linedraw_cmds[unicode - 0x2500])
       return true;
 
-    if (IS_PSEUDO (unicode))
+    if (IS_COMPOSE (unicode))
       return true;
 
     switch (unicode)
@@ -351,9 +351,9 @@ rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
           gcv.line_width = 0;
           XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
         }
-      else if (IS_PSEUDO (t))
+      else if (IS_COMPOSE (t))
         {
-          const compose_char &cc = r->composite (t);
+          const compose_char &cc = rxvt_composite[t];
           (void)0; //D ADD pseudo handling here
         }
       else

diff --git a/src/encoding.h b/src/encoding.h
index 64e6dd4eea8655802ab55a7822dea494e0cb6a1d..17de921a5144873e6c113123d51c5c38049513c2 100644 (file)
--- a/src/encoding.h
+++ b/src/encoding.h
@@ -6,7 +6,6 @@
 // order must match the table in encoding.C(!)
 enum codeset {
   CS_UNKNOWN = 0,
-  CS_SPECIAL,
   CS_US_ASCII,
 
   CS_ISO8859_1,
@@ -63,6 +62,7 @@ codeset codeset_from_name (const char *name);
 
 enum {
   ZERO_WIDTH_CHAR = 0x200b,
+  REPLACEMENT_CHAR = 0xfffd,
   NOCHAR = 65535, // must be invalid in ANY codeset (!)
 };
 
@@ -73,6 +73,8 @@ struct rxvt_codeset_conv {
 
 extern const rxvt_codeset_conv *rxvt_codeset[NUM_CODESETS];
 
+extern uint32_t rxvt_compose (uint32_t c1, uint32_t c2);
+
 #define FROM_UNICODE(cs,code) rxvt_codeset[cs]->from_unicode (code)
 #define TO_UNICODE(cs,code)   rxvt_codeset[cs]->to_unicode   (code)