From 49c57bec5f6ec7529feebe770d9f7102b8b35fcd Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Tue, 20 Aug 2002 08:52:41 +0000
Subject: [PATCH] Synch with Oort Gnus.

---
 lisp/ChangeLog   |   14 ++++++++++++++
 lisp/gnus-art.el |    5 ++++-
 lisp/message.el  |    2 +-
 lisp/nnheader.el |    4 ++--
 lisp/nnmh.el     |    2 +-
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1b2b1ae..01317f9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,18 @@
 2002-08-20  Katsumi Yamaoka <yamaoka@jpl.org>
+	From 小関 吉則 (KOSEKI Yoshinori) <kose@meadowy.org>.
+
+	* message.el (message-set-auto-save-file-name): Add support for
+	the Cygwin Emacs; the system-type is `cygwin'.
+	* nnheader.el (nnheader-file-name-translation-alist): Ditto.
+
+2002-08-20  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* gnus-art.el (gnus-button-url-regexp): Use POSIX regexp if possible.
+
+	* nnmh.el (nnmh-request-list-1): Use %.0f instead of %d to
+	avoid arithmetic errors.
+
+2002-08-20  Katsumi Yamaoka <yamaoka@jpl.org>
 
 	* gnus-art.el: Don't fbind `gnus-article-replace-with-quoted-text'.
 
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index bb35f32..404e47c 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -5719,7 +5719,10 @@ after replacing with the original article."
 
 ;;; Internal Variables:
 
-(defcustom gnus-button-url-regexp "\\b\\(\\(www\\.\\|\\(s?https?\\|ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\|info\\):\\)\\(//[-a-zA-Z0-9_.]+:[0-9]*\\)?\\([-a-zA-Z0-9_=!?#$@~`%&*+|\\/:;.,]\\|\\w\\)+\\([-a-zA-Z0-9_=#$@~`%&*+|\\/]\\|\\w\\)\\)"
+(defcustom gnus-button-url-regexp 
+  (if (string-match "[[:digit:]]" "1") ;; support POSIX?
+      "\\b\\(\\(www\\.\\|\\(s?https?\\|ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\|info\\):\\)\\(//[-a-zA-Z0-9_.]+:[0-9]*\\)?[-a-zA-Z0-9_=!?#$@~`%&*+|\\/:;.,[:word:]]+[-a-zA-Z0-9_=#$@~`%&*+|\\/[:word:]]\\)"
+    "\\b\\(\\(www\\.\\|\\(s?https?\\|ftp\\|file\\|gopher\\|news\\|telnet\\|wais\\|mailto\\|info\\):\\)\\(//[-a-zA-Z0-9_.]+:[0-9]*\\)?\\([-a-zA-Z0-9_=!?#$@~`%&*+|\\/:;.,]\\|\\w\\)+\\([-a-zA-Z0-9_=#$@~`%&*+|\\/]\\|\\w\\)\\)")
   "Regular expression that matches URLs."
   :group 'gnus-article-buttons
   :type 'regexp)
diff --git a/lisp/message.el b/lisp/message.el
index f3d9e6f..bca1f50 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5188,7 +5188,7 @@ than 988 characters long, and if they are not, trim them until they are."
       (setq buffer-file-name (expand-file-name
 			      (if (memq system-type
 					'(ms-dos ms-windows windows-nt
-						 cygwin32 win32 w32
+						 cygwin cygwin32 win32 w32
 						 mswindows))
 				  "message"
 				"*message*")
diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index 312c274..e9fc870 100644
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -82,11 +82,11 @@ Integer values will in effect be rounded up to the nearest multiple of
 (defvar nnheader-file-name-translation-alist
   (let ((case-fold-search t))
     (cond
-     ((string-match "windows-nt\\|os/2\\|emx\\|cygwin32"
+     ((string-match "windows-nt\\|os/2\\|emx\\|cygwin"
 		    (symbol-name system-type))
       (append (mapcar (lambda (c) (cons c ?_))
 		      '(?: ?* ?\" ?< ?> ??))
-	      (if (string-match "windows-nt\\|cygwin32"
+	      (if (string-match "windows-nt\\|cygwin"
 				(symbol-name system-type))
 		  nil
 		'((?+ . ?-)))))
diff --git a/lisp/nnmh.el b/lisp/nnmh.el
index e814774..d81bc2d 100644
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -239,7 +239,7 @@ as unread by Gnus.")
 	  (goto-char (point-max))
 	  (insert
 	   (format
-	    "%s %d %d y\n"
+	    "%s %.0f %.0f y\n"
 	    (progn
 	      (string-match
 	       (regexp-quote
-- 
1.7.10.4