*** empty log message ***

diff --git a/Changes b/Changes
index 13a20e4..4873086 100644 (file)
--- a/Changes
+++ b/Changes
@@ -13,6 +13,15 @@ TODO: meta-tagging of data by regex (my dream project)
 TODO: triple-click == select full output line
 TODO: double-click: more intelligent (urls etc.)
 
 TODO: triple-click == select full output line
 TODO: double-click: more intelligent (urls etc.)
 

+4.3  Sat Dec  4 04:58:37 CET 2004
+        - unapply the "emulated graphical chars. respect wcwidth" patch.
+          obviously in locales not having these characters they should
+          still have a width. Solve it correctly by not relying on wcwidth.
+          Note to self: do not ever apply patches without checking them
+          thoroughly.
+       - updated .spec file, it's included in the release tarball
+          now, too.
+

 4.2  Wed Dec  1 03:30:22 CET 2004
        - make emulated graphical characters respect wcwidth
           (forgot who reported this).
 4.2  Wed Dec  1 03:30:22 CET 2004
        - make emulated graphical characters respect wcwidth
           (forgot who reported this).

diff --git a/src/screen.C b/src/screen.C
index 8dc463d..6aab635 100644 (file)
--- a/src/screen.C
+++ b/src/screen.C
@@ -890,15 +890,12 @@ rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
       // characters have width -1 (DOH!) on GNU/Linux sometimes.
       int width = c < 0x100 ? 1 : wcwidth (c);
 
       // characters have width -1 (DOH!) on GNU/Linux sometimes.
       int width = c < 0x100 ? 1 : wcwidth (c);
 

-      if (screen.flags & Screen_Insert)
-        scr_insdel_chars (width, INSERT);
-

       if (charsets[screen.charset] == '0') // DEC SPECIAL
         {
           // vt100 special graphics and line drawing
           // 5f-7e standard vt100
           // 40-5e rxvt extension for extra curses acs chars
       if (charsets[screen.charset] == '0') // DEC SPECIAL
         {
           // vt100 special graphics and line drawing
           // 5f-7e standard vt100
           // 40-5e rxvt extension for extra curses acs chars

-          static uint16_t vt100_0[63] = { // 5f .. 7e
+          static uint16_t vt100_0[63] = { // 40 .. 7e

             0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
             0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
             0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
             0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
             0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
             0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57


@@ -916,6 +913,9 @@ rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
             }
         }
 
             }
         }
 

+      if (screen.flags & Screen_Insert)
+        scr_insdel_chars (width, INSERT);
+

       if (width != 0)
         {
           // some utf-8 decoders decode surrogate characters.
       if (width != 0)
         {
           // some utf-8 decoders decode surrogate characters.

diff --git a/src/version.h b/src/version.h
index c0b8846..2451d17 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -1,5 +1,5 @@
-#define VERSION "4.2"
-#define VSTRING "40200"
-#define DATE   "2004-12-01"
-#define LSMDATE        "01DEC04"
-#define LIBVERSION "4:2:0"
+#define VERSION "4.3"
+#define VSTRING "40300"
+#define DATE   "2004-12-02"
+#define LSMDATE        "02DEC04"
+#define LIBVERSION "4:3:0"