From d0884f37f16dbc9583a85755465d9722c80b7b6b Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Fri, 27 Jul 2001 00:07:45 +0000
Subject: [PATCH] Synch with Oort Gnus.

---
 lisp/ChangeLog       |   16 ++++++++++++++++
 lisp/gnus-art.el     |    3 ++-
 lisp/gnus-ems.el     |    5 ++++-
 lisp/gnus-mailcap.el |    8 ++++++--
 lisp/gnus.el         |    7 +++++--
 lisp/message.el      |    5 ++++-
 6 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fcb2ae6..385a70f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2001-07-26 16:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* gnus.el (gnus-parameters): Make it customizable.
+
+2001-07-26 15:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* gnus-art.el (gnus-mm-display-part): Narrow to point if eobp.
+
+	* message.el (message-set-auto-save-file-name): More
+	poor-system-types.
+
+	* mailcap.el (mailcap-parse-mimetypes): poor-system-types.
+
+	* gnus-ems.el (nnheader-file-name-translation-alist): M$Windows-NT
+	supports +.
+
 2001-07-26 14:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* mm-decode.el (mm-readable-p): New.
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 929e770..6ae7638 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -4044,7 +4044,8 @@ If no internal viewer is available, use an external viewer."
 		      ;; This will remove the part.
 		      (mm-display-part handle)
 		    (save-restriction
-		      (narrow-to-region (point) (1+ (point)))
+		      (narrow-to-region (point)
+					(if (eobp) (point) (1+ (point))))
 		      (mm-display-part handle)
 		      ;; We narrow to the part itself and
 		      ;; then call the treatment functions.
diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index 3a6a096..69b6d48 100644
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -77,7 +77,10 @@
 	    (append nnheader-file-name-translation-alist
 		    (mapcar (lambda (c) (cons c ?_))
 			    '(?: ?* ?\" ?< ?> ??))
-		    '((?+ . ?-))))))))
+		    (if (string-match "windows-nt\\|cygwin32"
+				      (symbol-name system-type))
+			nil
+		      '((?+ . ?-)))))))))
 
 (defvar gnus-tmp-unread)
 (defvar gnus-tmp-replied)
diff --git a/lisp/gnus-mailcap.el b/lisp/gnus-mailcap.el
index 9c9919f..0dae2a9 100644
--- a/lisp/gnus-mailcap.el
+++ b/lisp/gnus-mailcap.el
@@ -287,6 +287,10 @@ Nil means your home directory."
 		 directory)
   :group 'mailcap)
 
+(defvar mailcap-poor-system-types
+  '(ms-dos ms-windows windows-nt win32 w32 mswindows)
+  "Systems that don't have a Unix-like directory hierarchy.")
+
 ;;;
 ;;; Utility functions
 ;;;
@@ -363,7 +367,7 @@ MAILCAPS if set; otherwise (on Unix) use the path from RFC 1524, plus
     (cond
      (path nil)
      ((getenv "MAILCAPS") (setq path (getenv "MAILCAPS")))
-     ((memq system-type '(ms-dos ms-windows windows-nt))
+     ((memq system-type mailcap-poor-system-types)
       (setq path '("~/.mailcap" "~/mail.cap" "~/etc/mail.cap")))
      (t (setq path
 	      ;; This is per RFC 1524, specifically
@@ -860,7 +864,7 @@ If FORCE, re-parse even if already parsed."
     (cond
      (path nil)
      ((getenv "MIMETYPES") (setq path (getenv "MIMETYPES")))
-     ((memq system-type '(ms-dos ms-windows windows-nt))
+     ((memq system-type mailcap-poor-system-types)
       (setq path '("~/mime.typ" "~/etc/mime.typ")))
      (t (setq path
 	      ;; mime.types seems to be the normal name, definitely so
diff --git a/lisp/gnus.el b/lisp/gnus.el
index 0d64fa9..f9ba146 100644
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -879,7 +879,7 @@ be set in `.emacs' instead."
 (require 'gnus-util)
 (require 'nnheader)
 
-(defvar gnus-parameters nil
+(defcustom gnus-parameters nil
   "Alist of group parameters.
 
 For example:
@@ -891,7 +891,10 @@ For example:
 		  (display . all))
      (\"mail\\\\.me\" (gnus-use-scoring  t))
      (\"list\\\\..*\" (total-expire . t)
-		  (broken-reply-to . t)))")
+		  (broken-reply-to . t)))"
+  :group 'gnus-group-various
+  :type '(repeat (cons regexp
+		       (repeat sexp))))
 
 (defvar gnus-group-parameters-more nil)
 
diff --git a/lisp/message.el b/lisp/message.el
index 21f90ba..03d07e2 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4618,7 +4618,10 @@ than 988 characters long, and if they are not, trim them until they are."
 	(setq message-draft-article
 	      (nndraft-request-associate-buffer "drafts"))
       (setq buffer-file-name (expand-file-name
-			      (if (eq system-type 'windows-nt)
+			      (if (memq system-type
+					'(ms-dos ms-windows windows-nt
+						 cygwin32 win32 w32
+						 mswindows))
 				  "message"
 				"*message*")
 			      message-auto-save-directory))
-- 
1.7.10.4