From: pcg <pcg>
Date: Thu, 11 Mar 2004 20:26:48 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=72f03b49306a47eb48be0ed618a9a212e5afd3bc;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/README.configure b/README.configure
index 4bb9e94c..8207a2f3 100644
--- a/README.configure
+++ b/README.configure
@@ -1,3 +1,10 @@
+General hint: if you get compile errors, then likely your configuration
+hasn't been tested well. Either try with --enable-everything or use the
+./reconf script as a base for experiments. ./reconf is used by myself,
+so it should generally be a working config. Of course, you should always
+report when a combination doesn't work, so it cnya be fixed. Marc Lehmann
+<rxvt@schmorp.de>.
+
 --enable-everything
         add support for all non-multichoice options listed in "./configure
         --help".  Note that unlike other enable options this is order
diff --git a/src/defaultfont.C b/src/defaultfont.C
index 65065b80..e0183c6e 100644
--- a/src/defaultfont.C
+++ b/src/defaultfont.C
@@ -315,7 +315,9 @@ rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
 
   while (len--)
     {
+#if ENABLE_COMBINING
       compose_char *cc;
+#endif
       text_t t = *text++;
 
       // is it in our linedrawing table?
@@ -354,6 +356,7 @@ rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
           gcv.line_width = 0;
           XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
         }
+#if ENABLE_COMBINING
       else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
         {
           rxvt_font *f1 = (*fs)[fs->find_font (cc->c1)];
@@ -368,6 +371,7 @@ rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
               f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
             }
         }
+#endif
       else
         switch (t)
           {