From: pcg <pcg>
Date: Wed, 24 Dec 2003 09:22:29 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=676a7051277d9f7aa08ee802607ad7aaa0ef844a;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/src/main.C b/src/main.C
index 6477c372..1888593d 100644
--- a/src/main.C
+++ b/src/main.C
@@ -1,7 +1,7 @@
 /*--------------------------------*-C-*---------------------------------*
  * File:        main.c
  *----------------------------------------------------------------------*
- * $Id: main.C,v 1.18 2003-12-19 06:17:03 pcg Exp $
+ * $Id: main.C,v 1.19 2003-12-24 09:22:29 pcg Exp $
  *
  * All portions of code are copyright by their respective author/s.
  * Copyright (c) 1992      John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
@@ -957,11 +957,16 @@ rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int igno
   if (fix_screen || old_height == 0)
     {
       int curr_screen = -1;
-      uint16_t old_ncol = prev_ncol;
+      int old_ncol = prev_ncol;
 
       /* scr_reset only works on the primary screen */
       if (old_height)      /* this is not the first time through */
-        curr_screen = rxvt_scr_change_screen (this, PRIMARY);
+        {
+          unsigned int ncol = TermWin.ncol;
+          TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
+          curr_screen = rxvt_scr_change_screen (this, PRIMARY);
+          TermWin.ncol = ncol;
+        }
 
       scr_reset();
 
diff --git a/src/rxvt.h b/src/rxvt.h
index 8f21896d..759d81e4 100644
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -1,5 +1,5 @@
 /*
- * $Id: rxvt.h,v 1.19 2003-12-19 09:41:09 pcg Exp $
+ * $Id: rxvt.h,v 1.20 2003-12-24 09:22:29 pcg Exp $
  */
 
 #ifndef _RXVT_H_                /* include once only */
@@ -887,7 +887,7 @@ struct rxvt_term : rxvt_vars {
 #endif
   short           rvideo;
   int16_t         num_scr;    /* screen: number lines scrolled             */
-  uint16_t        prev_ncol,   /* screen: previous number of columns        */
+  unsigned int    prev_ncol,  /* screen: previous number of columns        */
                   prev_nrow;  /* screen: previous number of rows           */
 #ifdef RXVT_GRAPHICS
   uint16_t        gr_prev_start;
diff --git a/src/salloc.C b/src/salloc.C
index 05951737..c718a8a5 100644
--- a/src/salloc.C
+++ b/src/salloc.C
@@ -51,7 +51,6 @@ rxvt_salloc::alloc ()
 void
 rxvt_salloc::free (void *data)
 {
-return;//D
   chain *line = (chain *)data;
   line->next = firstline;
   firstline = line;
diff --git a/src/screen.C b/src/screen.C
index 5fd24ac0..edeefb6b 100644
--- a/src/screen.C
+++ b/src/screen.C
@@ -1,7 +1,7 @@
 /*--------------------------------*-C-*--------------------------------------*
  * File:        screen.c
  *---------------------------------------------------------------------------*
- * $Id: screen.C,v 1.12 2003-12-18 14:11:47 pcg Exp $
+ * $Id: screen.C,v 1.13 2003-12-24 09:22:29 pcg Exp $
  *
  * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
  *
@@ -291,7 +291,7 @@ rxvt_term::scr_reset ()
           /* add rows */
           scr_reset_realloc (); /* realloc _first_ */
 
-          TermWin.ncol =  prev_ncol; // save b/c scr_blank_screen_mem uses this
+          TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
 
           k = min (TermWin.nscrolled, nrow - prev_nrow);
 
diff --git a/src/version.h b/src/version.h
index 8d23b2c8..1c92eb09 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,5 +1,5 @@
-#define VERSION "1.1"
-#define VSTRING "10100"
-#define DATE	"2003-18-12"
-#define LSMDATE	"18DEC03"
-#define LIBVERSION "1:1:0"
+#define VERSION "1.2"
+#define VSTRING "10200"
+#define DATE	"2003-24-12"
+#define LSMDATE	"24DEC03"
+#define LIBVERSION "1:2:0"