*** empty log message ***

diff --git a/MANIFEST b/MANIFEST
index d7af1534fee11663295e1267528c328be1c7eab3..2931cbcaca6795bd6aae736cc5c01f9f67ad3da8 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -106,16 +106,21 @@ autoconf/xpm.m4
 src/.cvsignore
 src/.indent.pro
 src/Makefile.in
-src/salloc.h
+src/callback.h
+src/command.C
 src/command.h
 src/defaultfont.C
 src/defaultfont.h
+src/encoding.C
+src/encoding.h
 src/feature.h
 src/graphics.C
 src/grkelot.C
 src/grkelot.h
 src/init.C
 src/init.h
+src/iom.C
+src/iom.h
 src/logging.C
 src/logging.h
 src/main.C
@@ -132,22 +137,29 @@ src/protos.h
 src/ptytty.C
 src/rxvt.C
 src/rxvt.h
+src/rxvtc.C
+src/rxvtcolor.C
+src/rxvtcolor.h
+src/rxvtd.C
+src/rxvtdaemon.C
+src/rxvtdaemon.h
 src/rxvtgrx.h
+src/rxvtlib.h
+src/rxvtlib.h.in
+src/rxvtvec.C
+src/rxvtvec.h
+src/salloc.C
+src/salloc.h
 src/screen.C
 src/scrollbar-next.C
 src/scrollbar-rxvt.C
 src/scrollbar-xterm.C
 src/scrollbar.C
+src/simplevec.h
 src/strings.C
 src/version.h
 src/xdefaults.C
 src/xpm.C
-src/rxvtlib.h
-src/command.C
-src/salloc.C
-src/rxvtlib.h.in
-src/iom.h
-src/encoding.C
 
 src/test/.cvsignore
 src/test/Makefile.in
@@ -162,19 +174,6 @@ src/graphics/grxlib.c
 src/graphics/grxlib.h
 src/graphics/qplot.c
 
-src/rxvtvec.C
-src/rxvtcolor.h
-src/rxvtvec.h
-src/rxvtcolor.C
-src/rxvtdaemon.h
-src/encoding.S
-src/encoding.h
-src/rxvtdaemon.C
-src/iom.C
-src/rxvtd.C
-src/callback.h
-src/rxvtc.C
-src/simplevec.h
 src/gentables
 src/table/viscii.h
 src/table/ksc5601_1987_0.h

diff --git a/src/defaultfont.C b/src/defaultfont.C
index 40ef2ad2d821cc403ada09dbf3257e80c3b56812..4daddd903062c3001546b1a22c7838f3c9d470b7 100644 (file)
--- a/src/defaultfont.C
+++ b/src/defaultfont.C
@@ -738,9 +738,11 @@ rxvt_font_xft::load (const rxvt_fontprop &prop)
   if (FcPatternGet (p, FC_SLANT, 0, &v) != FcResultMatch)
     FcPatternAddInteger (p, FC_SLANT, prop.slant);
 
+#if 0 // clipping unfortunately destroys our precious double-width-characters
   // clip width, we can't do better, or can we?
   if (FcPatternGet (p, FC_CHAR_WIDTH, 0, &v) != FcResultMatch)
     FcPatternAddInteger (p, FC_CHAR_WIDTH, prop.width);
+#endif
 
   //FcPatternAddBool (p, FC_MINSPACE, 1);