Synch with semi-1_14 branch.

diff --git a/ChangeLog b/ChangeLog
index a513ee4..8ff7251 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-10  Kenichi OKADA <okada@opaopa.org>
+
+       * semi-def.el (mime-browse-url-regexp): Allow nntps and ftps.
+
 2001-06-12  Yuuichi Teranishi <teranisi@gohome.org>
 
        * mime-view.el (mime-display-multipart/related): When "start"

diff --git a/semi-def.el b/semi-def.el
index 6ca512a..17f1d7b 100644 (file)
--- a/semi-def.el
+++ b/semi-def.el
@@ -206,7 +206,7 @@ if the TTY frame is used."
 ;;;
 
 (defcustom mime-browse-url-regexp
-  (concat "\\(https?\\|ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\):"
+  (concat "\\(https?\\|ftps?\\|file\\|gopher\\|news\\|nntps?\\|telnets?\\|wais\\|mailto\\):"
          "\\(//[-a-zA-Z0-9_.]+:[0-9]*\\)?"
          "[-a-zA-Z0-9_=?#$@~`%&*+|\\/.,]*[-a-zA-Z0-9_=#$@~`%&*+|\\/]")
   "*Regexp to match URL in text body."