From 4299bb58dee8c3008ea98c2388cb89ee719b9800 Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Wed, 5 Mar 2003 18:19:12 +0000 Subject: [w3m-dev 03792] URL match string incremental search fix * main.c (chkURLBuffer): allow - at end of URL string (dispincsrch): start from current position in case of incremental search * search.c (forwardSearch): found if same position (backwardSearch): ditto From: Fumitoshi UKAI --- main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 8f00db4..71d9e8a 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.215 2003/02/26 17:22:03 ukai Exp $ */ +/* $Id: main.c,v 1.216 2003/03/05 18:19:15 ukai Exp $ */ #define MAINPROGRAM #include "fm.h" #include @@ -1603,6 +1603,7 @@ dispincsrch(int ch, Str buf, Lineprop *prop) if (ch == 0 && buf == NULL) { SAVE_BUFPOSITION(&sbuf); /* search starting point */ currentLine = sbuf.currentLine; + sbuf.pos -= 1; /* XXX start from current position */ pos = sbuf.pos; return -1; } @@ -4649,7 +4650,7 @@ void chkURLBuffer(Buffer *buf) { static char *url_like_pat[] = { - "https?://[a-zA-Z0-9][a-zA-Z0-9:%\\-\\./?=~_\\&+@#,\\$;]*[a-zA-Z0-9_/=]", + "https?://[a-zA-Z0-9][a-zA-Z0-9:%\\-\\./?=~_\\&+@#,\\$;]*[a-zA-Z0-9_/=\\-]", "file:/[a-zA-Z0-9:%\\-\\./=_\\+@#,\\$;]*", #ifdef USE_GOPHER "gopher://[a-zA-Z0-9][a-zA-Z0-9:%\\-\\./_]*", -- cgit v1.2.3