w3m

commit 8f77d21f8a7a3880781a4dddc2bfe89f0b63a60e
parent e432eb95a7b7ad773a7fb3e610d2faf65f9540e4
Author: ukai <ukai>
Date:   Mon,  3 Feb 2003 15:49:13 +0000

[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>

Diffstat:
M
ChangeLog
 | 
6
++++++
M
buffer.c
 | 
2
+-
M
display.c
 | 
7
+++----

3 files changed, 10 insertions(+), 5 deletions(-)
diff --git 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
diff --git a/buffer.c b/buffer.c
@@ -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
@@ -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);
     }