aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog11
-rw-r--r--display.c4
-rw-r--r--linein.c14
-rw-r--r--main.c4
4 files changed, 24 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 43501e5..9aaae9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-03-06 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03794] displayBuffer() when CurrentTab == NULL.
+ * display.c (displayBuffer): check buf
+ * linein.c (inputLineHistSearch): check CurrentTab
+ (next_dcompl): check CurrentTab
+ (_editor): check CurrentTab
+ * main.c (resize_screen): check CurrentTab
+
2003-03-06 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev 03793] incremental search fix
@@ -7317,4 +7326,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.772 2003/03/05 18:56:28 ukai Exp $
+$Id: ChangeLog,v 1.773 2003/03/06 14:30:19 ukai Exp $
diff --git a/display.c b/display.c
index 31d77f9..d0897e4 100644
--- a/display.c
+++ b/display.c
@@ -1,4 +1,4 @@
-/* $Id: display.c,v 1.64 2003/02/06 17:16:56 ukai Exp $ */
+/* $Id: display.c,v 1.65 2003/03/06 14:30:25 ukai Exp $ */
#include <signal.h>
#include "fm.h"
@@ -372,6 +372,8 @@ displayBuffer(Buffer *buf, int mode)
Str msg;
int ny = 0;
+ if (!buf)
+ return;
if (buf->topLine == NULL && readBufferCache(buf) == 0) { /* clear_buffer */
mode = B_FORCE_REDRAW;
}
diff --git a/linein.c b/linein.c
index 77a07ed..1887b31 100644
--- a/linein.c
+++ b/linein.c
@@ -1,4 +1,4 @@
-/* $Id: linein.c,v 1.27 2003/02/05 16:43:58 ukai Exp $ */
+/* $Id: linein.c,v 1.28 2003/03/06 14:30:26 ukai Exp $ */
#include "fm.h"
#include "local.h"
#include "myctype.h"
@@ -287,8 +287,10 @@ inputLineHistSearch(char *prompt, char *def_str, int flag, Hist *hist,
break;
} while (i_cont);
- if (need_redraw)
- displayBuffer(Currentbuf, B_FORCE_REDRAW);
+ if (CurrentTab) {
+ if (need_redraw)
+ displayBuffer(Currentbuf, B_FORCE_REDRAW);
+ }
#ifdef SUPPORT_WIN9X_CONSOLE_MBCS
disable_win9x_console_input();
@@ -755,7 +757,8 @@ next_dcompl(int next)
if (cm_mode == CPL_NEVER || cm_mode & CPL_OFF)
return;
cm_disp_clear = FALSE;
- displayBuffer(Currentbuf, B_FORCE_REDRAW);
+ if (CurrentTab)
+ displayBuffer(Currentbuf, B_FORCE_REDRAW);
if (LASTLINE >= 3) {
comment = TRUE;
@@ -1150,5 +1153,6 @@ _editor(void)
Strcat_char(strBuf, *p);
}
CLen = CPos = setStrType(strBuf, strProp);
- displayBuffer(Currentbuf, B_FORCE_REDRAW);
+ if (CurrentTab)
+ displayBuffer(Currentbuf, B_FORCE_REDRAW);
}
diff --git a/main.c b/main.c
index 01fac65..a7822a1 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.217 2003/03/05 18:56:28 ukai Exp $ */
+/* $Id: main.c,v 1.218 2003/03/06 14:30:27 ukai Exp $ */
#define MAINPROGRAM
#include "fm.h"
#include <signal.h>
@@ -1375,7 +1375,7 @@ resize_screen(void)
{
setlinescols();
setupscreen();
- if (Currentbuf)
+ if (CurrentTab)
displayBuffer(Currentbuf, B_FORCE_REDRAW);
}
#endif /* SIGWINCH */