diff options
author | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-03-06 14:30:19 +0000 |
---|---|---|
committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-03-06 14:30:19 +0000 |
commit | 8b864dcab92cfb110aab29f98a900cb86066a40e (patch) | |
tree | b08a054def9e514cb7108bce7d9d84451abce89c | |
parent | fix indent (diff) | |
download | w3m-8b864dcab92cfb110aab29f98a900cb86066a40e.tar.gz w3m-8b864dcab92cfb110aab29f98a900cb86066a40e.zip |
[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
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | display.c | 4 | ||||
-rw-r--r-- | linein.c | 14 | ||||
-rw-r--r-- | main.c | 4 |
4 files changed, 24 insertions, 9 deletions
@@ -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 $ @@ -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; } @@ -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); } @@ -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 */ |