Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 51b6613..bd4ada5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2001-07-11 18:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mm-encode.el (mm-content-transfer-encoding-defaults): Use base64
+       for the default encoding.
+
+       * nnrss.el (nnrss-url-field): New field.
+       (nnrss-request-article): Add newsgroups.
+
+       * nnfolder.el (nnfolder-read-folder): Force to use a multibyte buffer.
+
 2001-07-11 04:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * nndraft.el (nndraft-request-restore-buffer): Don't remove Date.

diff --git a/lisp/mm-encode.el b/lisp/mm-encode.el
index f9acf6e..fee9e25 100644 (file)
--- a/lisp/mm-encode.el
+++ b/lisp/mm-encode.el
@@ -36,7 +36,7 @@
     ("message/rfc822" 8bit)
     ("application/emacs-lisp" 8bit)
     ("application/x-patch" 8bit)
-    (".*" qp-or-base64))
+    (".*" base64))
   "Alist of regexps that match MIME types and their encodings.
 If the encoding is `qp-or-base64', then either quoted-printable
 or base64 will be used, depending on what is more efficient.")

diff --git a/lisp/nnrss.el b/lisp/nnrss.el
index 13d3527..bc4bf58 100644 (file)
--- a/lisp/nnrss.el
+++ b/lisp/nnrss.el
@@ -175,6 +175,10 @@
   "Field name used for DESCRIPTION.
 To use the description in headers, put this name into `nnmail-extra-headers'.")
 
+(defvar nnrss-url-field 'X-Gnus-Url
+  "Field name used for URL.
+To use the description in headers, put this name into `nnmail-extra-headers'.")
+
 (nnoo-define-basics nnrss)
 
 ;;; Interface functions
@@ -211,6 +215,14 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
                                 (nnrss-format-string (nth 6 e))
                                 "\t")
                      "")
+                    (if (and (nth 2 e)
+                             (memq nnrss-url-field 
+                                   nnmail-extra-headers))
+                       (concat (symbol-name nnrss-url-field)
+                               ": "
+                                (nnrss-format-string (nth 2 e))
+                                "\t")
+                     "")
                    "\n")))))
   'nov)
 
@@ -238,6 +250,8 @@ To use the description in headers, put this name into `nnmail-extra-headers'.")
        (with-current-buffer nntp-server-buffer
          (erase-buffer)
          (goto-char (point-min))
+          (if group
+              (insert "Newsgroups: " group "\n"))
          (if (nth 3 e)
              (insert "Subject: " (nnrss-format-string (nth 3 e)) "\n"))
          (if (nth 4 e)