From c18ea0f1c7160410c6c44399667de3a0e5a9c3f4 Mon Sep 17 00:00:00 2001
From: root <root>
Date: Sun, 21 Nov 2004 20:19:24 +0000
Subject: [PATCH] *** empty log message ***

---
 Changes        | 14 +++++++++++++-
 src/command.C  |  4 ++--
 src/rxvtfont.C |  4 ++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Changes b/Changes
index 7dd50a95..0f3c8881 100644
--- a/Changes
+++ b/Changes
@@ -2,12 +2,24 @@ Lines marked with "xterm:" indicate either xterm features ported to rxvt
 or changed rxvt behaviour to make it more compatible to xterm (usually
 xfree86's xterm).
 
+TODO: hotkey font resizing
+TODO: +ssc -ssr seems to scroll at wrong time, scrolling up the empty sec. scr.
 TODO: multibyte support for setwmname et al.
 TODO: tabbed windows
-TODO: ignore user-supplied preedit-type, or augment with default list.
 TODO: there are other todo items, but they are not in this file.
 TODO: OnTheSpot editing.
 
+4.1  Sun Nov 21 21:10:19 CET 2004
+	- save and restore cursor position in secondary screen regardless of
+          -ssc/-ssr settings.
+	- fix some 64-bit bugs that lead to crashes with certain other
+          programs like vncviewer (original rxvt also affected).
+	- added doc/podtbl to the dist tarball.
+        - add compile fix for darwin.
+        - configure fix for transparency without tinting.
+        - changed CN to ZH _really_ everywhere.
+        - upgraded iom.[Ch].
+
 4.0  Mon Sep 13 01:10:26 CEST 2004
 	- turn off autohinting for some badly-hinted fallback fonts.
         - mnaapge tpyo crorcetoins by Bastian Kleineidam.
diff --git a/src/command.C b/src/command.C
index b0d814c6..514b40b4 100644
--- a/src/command.C
+++ b/src/command.C
@@ -419,7 +419,7 @@ rxvt_term::lookup_key (XKeyEvent &ev)
                   case XK_Insert:	/* Shift+Insert = paste mouse selection */
                     selection_request (ev.time, 0, 0);
                     return;
-#if TODO // TODO
+#if TODO
                     /* rxvt extras */
                   case XK_KP_Add:	/* Shift+KP_Add = bigger font */
                     change_font (FONT_UP);
@@ -3763,7 +3763,7 @@ rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp)
         process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
         break;
 #endif
-#if TRANSPARENT || TINTING
+#if TRANSPARENT && TINTING
       case XTerm_Color_tint:
         process_color_seq (XTerm_Color_tint, Color_tint, str, resp);
         check_our_parents ();
diff --git a/src/rxvtfont.C b/src/rxvtfont.C
index 1c42d04c..88913e16 100644
--- a/src/rxvtfont.C
+++ b/src/rxvtfont.C
@@ -694,7 +694,7 @@ rxvt_font_x11::load (const rxvt_fontprop &prop)
       char fname[1024];
 
       int diff = 0;
-      
+
       if (replace_field (fname, list[i], 6, '0', field_str))
         diff += 10; // slightly penalize scalable fonts
 
@@ -1058,7 +1058,7 @@ rxvt_font_xft::load (const rxvt_fontprop &prop)
   FcValue v;
 
   if (prop.height != rxvt_fontprop::unset
-      && FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch)
+      || FcPatternGet (p, FC_PIXEL_SIZE, 0, &v) != FcResultMatch)
     FcPatternAddInteger (p, FC_PIXEL_SIZE, prop.height);
 
   if (prop.weight != rxvt_fontprop::unset
-- 
2.34.1