aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2003-01-23 18:42:51 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2003-01-23 18:42:51 +0000
commit3b74155de01f9c37f8c0271feddc79d9bbbb1070 (patch)
tree3883827fc2b507dfc53020f0b82587f0e3b51978
parentfix indent (diff)
downloadw3m-3b74155de01f9c37f8c0271feddc79d9bbbb1070.tar.gz
w3m-3b74155de01f9c37f8c0271feddc79d9bbbb1070.zip
fix compiler warnings
* display.c (displayBuffer): fix suggest parentheses around && within || From: Fumitoshi UKAI <ukai@debian.or.jp>
-rw-r--r--ChangeLog6
-rw-r--r--display.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fb82a97..8157d50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-24 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * fix compiler warnings
+ * display.c (displayBuffer): fix suggest parentheses around && within ||
2003-01-24 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03667] fold patch
@@ -6815,4 +6819,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.709 2003/01/23 18:37:18 ukai Exp $
+$Id: ChangeLog,v 1.710 2003/01/23 18:42:51 ukai Exp $
diff --git a/display.c b/display.c
index 2eb8c1f..aeca594 100644
--- a/display.c
+++ b/display.c
@@ -1,4 +1,4 @@
-/* $Id: display.c,v 1.54 2003/01/23 18:38:05 ukai Exp $ */
+/* $Id: display.c,v 1.55 2003/01/23 18:42:52 ukai Exp $ */
#include <signal.h>
#include "fm.h"
@@ -363,8 +363,8 @@ displayBuffer(Buffer *buf, int mode)
buf->width = COLS;
if (buf->height == 0)
buf->height = LASTLINE + 1;
- if ((buf->width != INIT_BUFFER_WIDTH && (buf->type &&
- !strcmp(buf->type, "text/html")
+ if ((buf->width != INIT_BUFFER_WIDTH && ((buf->type &&
+ !strcmp(buf->type, "text/html"))
|| FoldLine))
|| buf->need_reshape) {
buf->need_reshape = TRUE;