[w3m-dev 03724] Re: view source, edit source

* buffer.c (reshapeBuffer): initialize buf->width first
* display.c (displayBuffer): no need to check buf>sourcefile
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

3 files changed, 13 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index e353730..5d4a128 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-04  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 03724] Re: view source, edit source
+	* buffer.c (reshapeBuffer): initialize buf->width first
+	* display.c (displayBuffer): no need to check buf>sourcefile
+
 2003-02-01  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
 
 	* [w3m-dev 03721] PATH_INFO support of local CGI
@@ -7008,4 +7014,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.734 2003/01/31 16:25:02 ukai Exp $
+$Id: ChangeLog,v 1.735 2003/02/03 15:49:13 ukai Exp $
diff --git a/buffer.c b/buffer.c
index 0cbc168..f3165c1 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,4 +1,4 @@
-/* $Id: buffer.c,v 1.26 2003/01/28 16:42:02 ukai Exp $ */
+/* $Id: buffer.c,v 1.27 2003/02/03 15:49:19 ukai Exp $ */
 #include "fm.h"
 
 #ifdef USE_MOUSE
@@ -500,6 +500,7 @@ reshapeBuffer(Buffer *buf)
     if (!buf->need_reshape)
 	return;
     buf->need_reshape = FALSE;
+    buf->width = INIT_BUFFER_WIDTH;
     if (buf->sourcefile == NULL)
 	return;
     init_stream(&f, SCM_LOCAL, NULL);
@@ -525,7 +526,6 @@ reshapeBuffer(Buffer *buf)
 	buf->hmarklist->nmark = 0;
     if (buf->imarklist)
 	buf->imarklist->nmark = 0;
-    buf->width = INIT_BUFFER_WIDTH;
 
     if (buf->header_source) {
 	if (buf->currentURL.scheme != SCM_LOCAL ||
diff --git a/display.c b/display.c
index beb916f..a537e1e 100644
--- a/display.c
+++ b/display.c
@@ -1,4 +1,4 @@
-/* $Id: display.c,v 1.60 2003/01/29 17:38:14 ukai Exp $ */
+/* $Id: display.c,v 1.61 2003/02/03 15:49:21 ukai Exp $ */
 #include <signal.h>
 #include "fm.h"
 
@@ -363,10 +363,9 @@ displayBuffer(Buffer *buf, int mode)
 	buf->width = INIT_BUFFER_WIDTH;
     if (buf->height == 0)
 	buf->height = LASTLINE + 1;
-    if (buf->sourcefile &&
-	((buf->width != INIT_BUFFER_WIDTH &&
-	  ((buf->type && !strcmp(buf->type, "text/html")) || FoldLine))
-	 || buf->need_reshape)) {
+    if ((buf->width != INIT_BUFFER_WIDTH &&
+	 ((buf->type && !strcmp(buf->type, "text/html")) || FoldLine))
+	|| buf->need_reshape) {
 	buf->need_reshape = TRUE;
 	reshapeBuffer(buf);
     }