From 673b0feb77011e539bce8f8dbda25de803a9b165 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Fri, 29 Mar 2002 16:58:06 +0000 Subject: [w3m-dev 03162] Re: "ttp:" is marked instead of "http:" by MARL_URL * main.c (chkURLBuffer): "mailto" removed when USE_W3MMAILER in this case, chkExternalURIBuffer() will mark mailto: URL. From: Fumitoshi UKAI --- ChangeLog | 8 +++++++- main.c | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f302ec0..fef67bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-03-30 Fumitoshi UKAI + + * [w3m-dev 03162] Re: "ttp:" is marked instead of "http:" by MARL_URL + * main.c (chkURLBuffer): "mailto" removed when USE_W3MMAILER + in this case, chkExternalURIBuffer() will mark mailto: URL. + 2002-03-30 Hironori Sakamoto * [w3m-dev 03160] Re: "ttp:" is marked instead of "http:" by MARL_URL @@ -3317,4 +3323,4 @@ * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.365 2002/03/29 16:39:37 ukai Exp $ +$Id: ChangeLog,v 1.366 2002/03/29 16:58:06 ukai Exp $ diff --git a/main.c b/main.c index e6a787e..966524a 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.95 2002/03/29 16:32:00 ukai Exp $ */ +/* $Id: main.c,v 1.96 2002/03/29 16:58:06 ukai Exp $ */ #define MAINPROGRAM #include "fm.h" #include @@ -4354,7 +4354,9 @@ chkURLBuffer(Buffer *buf) "news:[^<> ][^<> ]*", "nntp://[a-zA-Z0-9][a-zA-Z0-9:%\\-\\./_]*", #endif /* USE_NNTP */ +#ifndef USE_W3MMAILER /* see also chkExternalURIBuffer() */ "mailto:[^<> ][^<> ]*@[a-zA-Z0-9][a-zA-Z0-9\\-\\._]*[a-zA-Z0-9]", +#endif #ifdef INET6 "https?://[a-zA-Z0-9:%\\-\\./_@]*\\[[a-fA-F0-9:][a-fA-F0-9:\\.]*\\][a-zA-Z0-9:%\\-\\./?=~_\\&+@#,\\$;]*", "ftp://[a-zA-Z0-9:%\\-\\./_@]*\\[[a-fA-F0-9:][a-fA-F0-9:\\.]*\\][a-zA-Z0-9:%\\-\\./=_+@#,\\$]*", -- cgit v1.2.3