From f4975e8037a9f8b06a9d60cd41e41b920099d931 Mon Sep 17 00:00:00 2001
From: root <root>
Date: Sun, 29 Mar 2009 13:36:03 +0000
Subject: [PATCH] *** empty log message ***

---
 src/rxvtfont.C | 8 ++++----
 src/rxvtfont.h | 2 +-
 src/screen.C   | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/rxvtfont.C b/src/rxvtfont.C
index a0d66ffa..ad93c535 100644
--- 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 ec286a3a..79f13737 100644
--- 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 715e8457..a4a14c5b 100644
--- 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++;
 
-- 
2.34.1