From e7c6a1c7f9170ec0d3c1c4581d1afc9984bcf733 Mon Sep 17 00:00:00 2001
From: Fumitoshi UKAI <ukai@debian.or.jp>
Date: Thu, 10 Jan 2002 15:39:21 +0000
Subject: [w3m-dev 02815] From: aito@fw.ipsj.or.jp

---
 main.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'main.c')

diff --git a/main.c b/main.c
index cffd2a7..7e356a4 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.55 2002/01/04 19:14:36 ukai Exp $ */
+/* $Id: main.c,v 1.56 2002/01/10 15:39:21 ukai Exp $ */
 #define MAINPROGRAM
 #include "fm.h"
 #include <signal.h>
@@ -4147,10 +4147,7 @@ void
 chkURLBuffer(Buffer *buf)
 {
     static char *url_like_pat[] = {
-	"http://[a-zA-Z0-9][a-zA-Z0-9:%\\-\\./?=~_\\&+@#,\\$;]*[a-zA-Z0-9_/=]",
-#ifdef USE_SSL
-	"https://[a-zA-Z0-9][a-zA-Z0-9:%\\-\\./?=~_\\&+@#,\\$;]*[a-zA-Z0-9_/=]",
-#endif				/* USE_SSL */
+	"https?://[a-zA-Z0-9][a-zA-Z0-9:%\\-\\./?=~_\\&+@#,\\$;]*[a-zA-Z0-9_/=]",
 #ifdef USE_GOPHER
 	"gopher://[a-zA-Z0-9][a-zA-Z0-9:%\\-\\./_]*",
 #endif				/* USE_GOPHER */
@@ -4161,10 +4158,7 @@ chkURLBuffer(Buffer *buf)
 #endif				/* USE_NNTP */
 	"mailto:[^<> 	][^<> 	]*@[a-zA-Z0-9][a-zA-Z0-9\\-\\._]*[a-zA-Z0-9]",
 #ifdef INET6
-	"http://[a-zA-Z0-9:%\\-\\./_@]*\\[[a-fA-F0-9:][a-fA-F0-9:\\.]*\\][a-zA-Z0-9:%\\-\\./?=~_\\&+@#,\\$;]*",
-#ifdef USE_SSL
-	"https://[a-zA-Z0-9:%\\-\\./_@]*\\[[a-fA-F0-9:][a-fA-F0-9:\\.]*\\][a-zA-Z0-9:%\\-\\./?=~_\\&+@#,\\$;]*",
-#endif				/* USE_SSL */
+	"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:%\\-\\./=_+@#,\\$]*",
 #endif				/* INET6 */
 	NULL
@@ -4189,7 +4183,7 @@ void
 chkNMIDBuffer(Buffer *buf)
 {
     static char *url_like_pat[] = {
-	"<[^<> 	][^<> 	]*@[A-z0-9\\.\\-_][A-z0-9\\.\\-_]*>",
+	"<[^<> 	][^<> 	]*@[A-z0-9\\.\\-_]+>",
 	NULL,
     };
     int i;
-- 
cgit v1.2.3