*** empty log message ***

diff --git a/src/command.C b/src/command.C
index 8011f828cf963dd36288dfb99f4e4c19186e1c8e..2641c2248c18ae84bdb16996b82fe00ed4a6f5b7 100644 (file)
--- a/src/command.C
+++ b/src/command.C
@@ -987,17 +987,15 @@ rxvt_term::flush ()
 
               do
                 {
-                  l = &ROW (row);
+                  l = &ROW (row++);
 
-                  if (l->f & LINE_FILTERED)
-                    row++;
-                  else
+                  if (!(l->f & LINE_FILTERED))
                     {
                       // line not filtered, mark it as filtered
                       l->f |= LINE_FILTERED;
                       while (l->is_longer ())
                         {
-                          l = &ROW (++row);
+                          l = &ROW (row++);
                           l->f |= LINE_FILTERED;
                         }
 
@@ -1009,7 +1007,7 @@ rxvt_term::flush ()
                 }
               while (l->is_longer () && row < end_row);
             }
-          while (++row < end_row);
+          while (row < end_row);
         }
 
       scr_refresh (refresh_type);

diff --git a/src/init.C b/src/init.C
index 134734d45867f5bac5c2e3abf73c3b08e224b2b5..3d810ffe566bd3295613781d77104479bf7221a9 100644 (file)
--- a/src/init.C
+++ b/src/init.C
@@ -351,9 +351,10 @@ rxvt_term::init_resources (int argc, const char *const *argv)
 
     if (!(display = displays.get (rs[Rs_display_name])))
       rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
+
+    extract_resources ();
   }
 
-  extract_resources ();
   free (r_argv);
 
   /*

diff --git a/src/main.C b/src/main.C
index e148576c2df1da78ba2a10e706ce0f5a695bc2fa..5d55faa1475cd479f37868ee3815fcb909843184 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -481,6 +481,7 @@ bool
 rxvt_term::init (int argc, const char *const *argv)
 {
   SET_R (this);
+  TEMP_ENV; // few things in X do not call setlocale :(
 
   set_locale ("");
 
@@ -535,7 +536,7 @@ rxvt_term::init (int argc, const char *const *argv)
 
   init_xlocale ();
 
-  scr_reset ();         /* initialize screen */
+  scr_reset (); // initialize screen
 
 #if 0
   XSynchronize (disp, True);
@@ -1448,6 +1449,8 @@ rxvt_term::IM_get_IC (const char *modifiers)
   char **s;
   XIMStyles *xim_styles;
 
+  TEMP_ENV;
+
   if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
     return false;