*** empty log message ***

diff --git a/Changes b/Changes
index 314f1c12ab602c7328eaff0a0fe9468194c1a41b..2a2e54c6e1eb9dd42a68317a5b4128927ec46117 100644 (file)
--- a/Changes
+++ b/Changes
@@ -34,7 +34,9 @@ TODO: look into the selection hilight patch
         - the automove-background extension now properly works when the
           pixmap gets reset with an osc sequence (sqweek).
         - selection-pastebin did not work properly with non-latin1-characters.
-        - removed rxvtlib.h from the tarballe, it had no reason to be there
+        - apply colorUL only when the text colour is the default fg
+          (patch by Wu Fengguang).
+        - removed rxvtlib.h from the tarball, it had no reason to be there
           (spotted by Decklin Foster).
         - fix compiling with TRANSPARENT but !XPM_BACKGROUND, as reported 
           by omatunto_.

diff --git a/src/screen.C b/src/screen.C
index 5e3f4129b4052e935d81fc958641f39aa749db8e..982f6d215638412a6e865e7c5e2ad7f9fb8ac21f 100644 (file)
--- a/src/screen.C
+++ b/src/screen.C
@@ -2298,7 +2298,7 @@ rxvt_term::scr_refresh () NOTHROW
 # endif
                 }
 
-              if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
+              if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
                 fore = Color_UL;
 #endif