commit c54a059bf10fddc3123c8ccb73d62388427c601c
parent 0c227f074ddb36172f5bcd9b202cf095cd8c8290
Author: ukai <ukai>
Date: Thu, 30 Jan 2003 16:29:11 +0000
[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>
Diffstat:
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -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
diff --git a/file.c b/file.c
@@ -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;
diff --git a/fm.h b/fm.h
@@ -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 {