diff options
| author | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-01-30 16:29:11 +0000 |
|---|---|---|
| committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-01-30 16:29:11 +0000 |
| commit | 79af75d00c435ab53e7d3c4b03bb54454b8b6dc9 (patch) | |
| tree | 650f0d83ef04c12afd43a7970811b47988ebb3f1 | |
| parent | [w3m-dev 03713] search with "$" (diff) | |
| download | w3m-79af75d00c435ab53e7d3c4b03bb54454b8b6dc9.tar.gz w3m-79af75d00c435ab53e7d3c4b03bb54454b8b6dc9.zip | |
[w3m-dev 03714] -cols 1 -dump -o fold_line=1
* file.c (addnewline): check i == 0, i == l->len
* fm.h (_INIT_BUFFER_WIDTH): added
(INIT_BUFFER_WIDTH): use _INIT_BUFFER_WIDTH
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | file.c | 11 | ||||
| -rw-r--r-- | fm.h | 5 |
3 files changed, 21 insertions, 4 deletions
@@ -1,5 +1,12 @@ 2003-01-31 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp> + * [w3m-dev 03714] -cols 1 -dump -o fold_line=1 + * file.c (addnewline): check i == 0, i == l->len + * fm.h (_INIT_BUFFER_WIDTH): added + (INIT_BUFFER_WIDTH): use _INIT_BUFFER_WIDTH + +2003-01-31 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp> + * [w3m-dev 03713] search with "$" * search.c (forwardSearch): check l->next && l->next->bpos (backwardSearch): check l->size, l->next && l->next->bpos @@ -6958,4 +6965,4 @@ a * [w3m-dev 03276] compile error on EWS4800 * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.727 2003/01/30 16:26:15 ukai Exp $ +$Id: ChangeLog,v 1.728 2003/01/30 16:29:11 ukai Exp $ @@ -1,4 +1,4 @@ -/* $Id: file.c,v 1.213 2003/01/29 17:38:14 ukai Exp $ */ +/* $Id: file.c,v 1.214 2003/01/30 16:29:13 ukai Exp $ */ #include "fm.h" #include <sys/types.h> #include "myctype.h" @@ -6145,6 +6145,15 @@ addnewline(Buffer *buf, char *line, Lineprop *prop, i--; #endif } + if (i == 0) { + i++; +#ifdef JP_CHARSET + if (CharType(p[i]) == PC_KANJI2) + i++; +#endif + } + if (i == l->len) + return; l->len = i; l->width = COLPOS(l, l->len); bpos += l->len; @@ -1,4 +1,4 @@ -/* $Id: fm.h,v 1.110 2003/01/29 17:10:37 ukai Exp $ */ +/* $Id: fm.h,v 1.111 2003/01/30 16:29:14 ukai Exp $ */ /* * w3m: WWW wo Miru utility * @@ -523,7 +523,8 @@ typedef struct _DownloadList { #define FONTSTAT_SIZE 4 -#define INIT_BUFFER_WIDTH (COLS - (showLineNum ? 6 : 1)) +#define _INIT_BUFFER_WIDTH (COLS - (showLineNum ? 6 : 1)) +#define INIT_BUFFER_WIDTH ((_INIT_BUFFER_WIDTH > 0) ? _INIT_BUFFER_WIDTH : 0) #define FOLD_BUFFER_WIDTH (FoldLine ? (INIT_BUFFER_WIDTH + 1) : -1) typedef struct { |