*** empty log message ***

diff --git a/src/rxvtfont.C b/src/rxvtfont.C
index a0d66ffad59fa77fe5ca418156e2a8b68a9a6be7..ad93c535d88073add8216ab01ade6a9b3fc06393 100644 (file)
--- a/src/rxvtfont.C
+++ b/src/rxvtfont.C
@@ -218,13 +218,13 @@ rxvt_font::rxvt_font ()
 }
 
 void
-rxvt_font::set_name (char *name)
+rxvt_font::set_name (char *name_)
 {
-  if (this->name == name)
+  if (name == name_)
     return;
 
-  if (this->name) free (this->name); // let the compiler optimize
-  this->name = name;
+  if (name) free (name); // let the compiler optimize
+  name = name_;
 }
 
 void

diff --git a/src/rxvtfont.h b/src/rxvtfont.h
index ec286a3a50e8c2730f20bc8c4d4009d3f60aa862..79f13737b7cc9773916f5371172b98c7bcecb58a 100644 (file)
--- a/src/rxvtfont.h
+++ b/src/rxvtfont.h
@@ -40,7 +40,7 @@ struct rxvt_font
   int ascent, descent,
       width, height;
 
-  void set_name (char *name);
+  void set_name (char *name_);
 
   rxvt_font ();
   virtual ~rxvt_font () { free (name); };

diff --git a/src/screen.C b/src/screen.C
index 715e8457c5a3f8a1b1d010ace98e0f85f78f36c0..a4a14c5b609e26d94530c24cc5b6a871787f4cf9 100644 (file)
--- a/src/screen.C
+++ b/src/screen.C
@@ -2252,7 +2252,8 @@ rxvt_term::scr_refresh () NOTHROW
               if (stp[col] == NOCHAR)
                 {
                   dtp[col] = stp[col];
-                  drp[col] = rend;
+                  drp[col] = srp[col];
+
                   count++;
                   i++;