diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | anchor.c | 6 | ||||
| -rw-r--r-- | fm.h | 3 | ||||
| -rw-r--r-- | rc.c | 6 |
5 files changed, 22 insertions, 5 deletions
@@ -1,5 +1,14 @@ 2002-03-30 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp> + * [w3m-dev 03160] Re: "ttp:" is marked instead of "http:" by MARL_URL + * NEWS: + * anchor.c (reAnchorAny): check MarkAllPages + * fm.h (MarkAllPages): added + * rc.c (CMT_MARK_ALL_PAGES): added + (mark_all_pages): added + +2002-03-30 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp> + * [w3m-dev 03159] "ttp:" is marked instead of "http:" by MARL_URL * main.c (chkURLBuffer): check internal URLs first @@ -3308,4 +3317,4 @@ * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.364 2002/03/29 16:32:00 ukai Exp $ +$Id: ChangeLog,v 1.365 2002/03/29 16:39:37 ukai Exp $ @@ -1,5 +1,6 @@ w3m 0.4? +* rc: mark_all_pages * configure: -mandir * func: COMMAND * -title option: set buffer name to terminal title @@ -1,4 +1,4 @@ -/* $Id: anchor.c,v 1.9 2002/01/31 18:28:24 ukai Exp $ */ +/* $Id: anchor.c,v 1.10 2002/03/29 16:39:37 ukai Exp $ */ #include "fm.h" #include "myctype.h" #include "regex.h" @@ -295,7 +295,9 @@ reAnchorAny(Buffer *buf, char *re, if ((re = regexCompile(re, 1)) != NULL) { return re; } - for (l = buf->firstLine; l != NULL; l = l->next) { + for (l = MarkAllPages ? buf->firstLine : buf->topLine; l != NULL && + (MarkAllPages || l->linenumber < buf->topLine->linenumber + LASTLINE); + l = l->next) { p = l->lineBuf; for (;;) { if (regexMatch(p, &l->lineBuf[l->len] - p, p == l->lineBuf) == 1) { @@ -1,4 +1,4 @@ -/* $Id: fm.h,v 1.57 2002/03/19 16:06:52 ukai Exp $ */ +/* $Id: fm.h,v 1.58 2002/03/29 16:39:37 ukai Exp $ */ /* * w3m: WWW wo Miru utility * @@ -866,6 +866,7 @@ global int FoldTextarea init(FALSE); #define DEFAULT_URL_CURRENT 1 #define DEFAULT_URL_LINK 2 global int DefaultURLString init(DEFAULT_URL_EMPTY); +global int MarkAllPages init(FALSE); #ifdef USE_MIGEMO global int use_migemo init(FALSE); @@ -1,4 +1,4 @@ -/* $Id: rc.c,v 1.40 2002/02/19 15:25:19 ukai Exp $ */ +/* $Id: rc.c,v 1.41 2002/03/29 16:39:37 ukai Exp $ */ /* * Initialization file etc. */ @@ -138,6 +138,7 @@ static char *config_file = NULL; #define CMT_ACCEPTLANG "受けつける言語(Accept-Language:)" #define CMT_DOCUMENTCODE "文書の文字コード" #define CMT_SYSTEMCODE "システムの文字コード" +#define CMT_MARK_ALL_PAGES "全てのページのURL風の文字列をリンクにする" #define CMT_WRAP "折り返し検索" #define CMT_VIEW_UNSEENOBJECTS "背景画像等へのリンクを作る" #ifdef __EMX__ @@ -272,6 +273,7 @@ static char *config_file = NULL; #define CMT_ACCEPTLANG "Accept-Language" /* #define CMT_DOCUMENTCODE "Document Charset" */ /* #define CMT_SYSTEMCODE "System Kanji Code" */ +#define CMT_MARK_ALL_PAGES "Mark URL-like strings as anchors in all pages" #define CMT_WRAP "Wrap search" #define CMT_VIEW_UNSEENOBJECTS "Display unseenobjects (e.g. bgimage) tag" #ifdef __EMX__ @@ -539,6 +541,8 @@ struct param_ptr params3[] = { {"vi_prec_num", P_INT, PI_ONOFF, (void *)&vi_prec_num, CMT_VI_PREC_NUM, NULL}, #endif + {"mark_all_pages", P_INT, PI_ONOFF, (void *)&MarkAllPages, + CMT_MARK_ALL_PAGES, NULL}, {"wrap_search", P_INT, PI_ONOFF, (void *)&WrapDefault, CMT_WRAP, NULL}, {"ignorecase_search", P_INT, PI_ONOFF, (void *)&IgnoreCase, CMT_IGNORE_CASE, NULL}, |