Synch with Oort Gnus (includes Tsuchiya-san's change).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index efae8e1..a3e6a2d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,22 @@
+2002-02-20  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * nndoc.el (nndoc-dissect-mime-parts-sub): Fix MIME-Version header
+       for mime-parts.
+
+       * gnus-art.el (gnus-article-edit-done): Widen the buffer.
+
+       * gnus-group.el (gnus-group-name-decode): Don't test
+       multibyte-string, because it breaks XEmacs.
+       From: TSUCHIYA Masatoshi <tsuchiya@pine.kuee.kyoto-u.ac.jp>
+
+       * message.el (message-send-mail): Be talkative.
+
+       * mm-decode.el (mm-inlined-types): Add application/x-emacs-lisp.
+       (mm-automatic-display): Ditto.
+       
+       * mailcap.el (mailcap-mime-data): Ditto.
+       From: Reiner Steib <4uce.02.r.steib@gmx.net>
+
 2002-02-20  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * many files: Remove trailing whitespaces, replace spc+tab with

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index ba9cf36..6a501a7 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -5595,6 +5595,7 @@ groups."
        (winconf gnus-prev-winconf))
     (remove-hook 'gnus-article-mode-hook
                 'gnus-article-mime-edit-article-unwind)
+    (widen) ;; Widen it in case that users narrowed the buffer.
     (funcall func arg)
     (set-buffer buf)
     ;; The cache and backlog have to be flushed somewhat.

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 3f70739..a14ea3c 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -1042,8 +1042,7 @@ The following commands are available:
       result)))
 
 (defun gnus-group-name-decode (string charset)
-  (if (and string charset (featurep 'mule)
-          (not (mm-multibyte-string-p string)))
+  (if (and string charset (featurep 'mule))
       (decode-coding-string string charset)
     string))
 

diff --git a/lisp/gnus-mailcap.el b/lisp/gnus-mailcap.el
index 1273050..7375288 100644 (file)
--- a/lisp/gnus-mailcap.el
+++ b/lisp/gnus-mailcap.el
@@ -1,5 +1,5 @@
 ;;; mailcap.el --- MIME media types configuration
-;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: William M. Perry <wmperry@aventail.com>
 ;;     Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -87,6 +87,9 @@
      ("emacs-lisp"
       (viewer . mailcap-maybe-eval)
       (type   . "application/emacs-lisp"))
+     ("x-emacs-lisp"
+      (viewer . mailcap-maybe-eval)
+      (type   . "application/x-emacs-lisp"))
      ("x-tar"
       (viewer . mailcap-save-binary-file)
       (non-viewer . t)

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 68bb88d..c7f7bc9 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -232,6 +232,7 @@ images, however this behavior may be changed in the future."
 (defcustom mm-inlined-types
   '("image/.*" "text/.*" "message/delivery-status" "message/rfc822"
     "message/partial" "message/external-body" "application/emacs-lisp"
+    "application/x-emacs-lisp"
     "application/pgp-signature" "application/x-pkcs7-signature"
     "application/pkcs7-signature" "application/x-pkcs7-mime"
     "application/pkcs7-mime")
@@ -253,7 +254,8 @@ when selecting a different article."
   '("text/plain" "text/enriched" "text/richtext" "text/html"
     "text/x-vcard" "image/.*" "message/delivery-status" "multipart/.*"
     "message/rfc822" "text/x-patch" "application/pgp-signature"
-    "application/emacs-lisp" "application/x-pkcs7-signature"
+    "application/emacs-lisp" "application/x-emacs-lisp"
+    "application/x-pkcs7-signature"
     "application/pkcs7-signature" "application/x-pkcs7-mime"
     "application/pkcs7-mime")
   "A list of MIME types to be displayed automatically."

diff --git a/lisp/nndoc.el b/lisp/nndoc.el
index 038e40e..21bd245 100644 (file)
--- a/lisp/nndoc.el
+++ b/lisp/nndoc.el
@@ -852,6 +852,10 @@ PARENT is the message-ID of the parent summary line, or nil for none."
     (unless article-insert
       (setq article-insert (buffer-substring (point-min) (point-max))
            head-end head-begin))
+    ;; Fix MIME-Version
+    (unless (string-match "MIME-Version:" article-insert)
+      (setq article-insert
+           (concat article-insert "MIME-Version: 1.0\n")))
     (setq summary-insert article-insert)
     ;; - summary Subject.
     (setq summary-insert

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 8c3efb5..50a45cd 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-20  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus.texi (Slave Gnusae): Addition. 
+       From  David S. Goldberg <david.goldberg6@verizon.net> 
+       
 2002-02-18  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * emacs-mime.texi (mailcap): Addition.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 79edc4f..f0a1931 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -1261,6 +1261,12 @@ Gnus \e$B$O!"?.Mj$G$-$k%W%m%0%i%`$N0l$D$H$7$F!"%5!<%P!<$H@\B3$G$-$J$$$H$-$O\e(B
 \e$B$b$A$m$s!"%9%l!<%V%U%!%$%k$+$i$N>pJs$OIaDL$N\e(B (\e$B$9$J$o$A!"%^%9%?!<$N\e(B) \e$B%U%!\e(B
 \e$B%$%k$h$j$bM%@h$5$l$^$9!#\e(B
 
+\e$B%9%l!<%V$r5/F0$9$k$H$-$K$b$7%^%9%?!<$N\e(B @code{.newsrc*} \e$B%U%!%$%k72$,%;!<\e(B
+\e$B%V$5$l$F$$$J$+$C$?$i!"<+F0J]B8$5$l$?%U%!%$%k$rFI$`$+$I$&$+$r?R$M$i$l$k$+\e(B
+\e$B$b$7$l$^$;$s!#\e(B"yes" \e$B$HEz$($k$H!"%^%9%?!<$K%;!<%V$5$l$F$$$J$$JQ99$O%9%l!<\e(B
+\e$B%V$KH?1G$5$l$^$;$s!#\e(B"no" \e$B$HEz$($k$H!"%^%9%?!<$GFI$^$l$?$$$/$D$+$N5-;v$,!"\e(B
+\e$B%9%l!<%V$G$OL$FI$G$"$k$H8+$J$5$l$k$+$b$7$l$^$;$s!#\e(B
+
 @node Fetching a Group
 @section \e$B%0%k!<%W$r<hF@$9$k\e(B
 @cindex fetching a group

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 832c1a2..48d8c84 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -1124,6 +1124,11 @@ they were created, so the latest changes will have precedence.)
 Information from the slave files has, of course, precedence over the
 information in the normal (i.e., master) @code{.newsrc} file.
 
+If the @code{.newsrc*} files have not been saved in the master when the
+slave starts, you may be prompted as to whether to read an auto-save
+file.  If you answer "yes", the unsaved changes to the master will be
+incorporated into the slave.  If you answer "no", the slave may see some
+messages as unread that have been read in the master.
 
 @node Fetching a Group
 @section Fetching a Group