Synch to Gnus 200305071929.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd04301..66506a2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2003-05-07  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-setup-1): Setup alternative email before
+       generate-headers.
+
+2003-05-07  Dave Love  <fx@gnu.org>
+
+       * rfc2047.el (rfc2047-encode-region): Skip \n as whitespace.
+
+       * mm-util.el (mm-find-mime-charset-region): Expurgate utf-16 from
+       possible values.
+
 2003-05-07  Jesper Harder  <harder@ifa.au.dk>
 
        * message.el (message-kill-to-signature): Fix.

diff --git a/lisp/message.el b/lisp/message.el
index 13e284e..af7a421 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5920,6 +5920,11 @@ are not included."
     (when message-default-mail-headers
       (insert message-default-mail-headers)
       (or (bolp) (insert ?\n)))
+    (save-restriction
+      (message-narrow-to-headers)
+      (if (and replybuffer
+              message-alternative-emails)
+         (message-use-alternative-email-as-from)))
     (when message-generate-headers-first
       (message-generate-headers
        (message-headers-to-generate
@@ -5931,9 +5936,6 @@ are not included."
   (message-insert-signature)
   (save-restriction
     (message-narrow-to-headers)
-    (if (and replybuffer
-            message-alternative-emails)
-       (message-use-alternative-email-as-from))
     (run-hooks 'message-header-setup-hook))
   (set-buffer-modified-p nil)
   (setq buffer-undo-list nil)

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 9b8b4a3..6d14862 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -568,16 +568,24 @@ charset, and a longer list means no appropriate charset."
                     ;; `compound-text' is not in the IANA list.  We
                     ;; shouldn't normally use anything here with a
                     ;; mime-charset having an `x-' prefix.
-                    ;; Fixme:  allow this to be overridden, since
+                    ;; Fixme:  Allow this to be overridden, since
                     ;; there is existing use of x-ctext.
                     ;; Also people apparently need the coding system
-                    ;; `iso-2022-jp-3', which Mule-UCS defines.
+                    ;; `iso-2022-jp-3' (which Mule-UCS defines with
+                    ;; mime-charset, though it's not valid).
                     (if (and cs
-                             (not (string-match "^[Xx]-" (symbol-name cs))))
+                             (not (string-match "^[Xx]-" (symbol-name cs)))
+                             ;; UTF-16 of any variety is invalid for
+                             ;; text parts and, unfortunately, has
+                             ;; mime-charset defined both in Mule-UCS
+                             ;; and versions of Emacs.  (The name
+                             ;; might be `mule-utf-16...'  or
+                             ;; `utf-16...'.)
+                             (not (string-match "utf-16" (symbol-name cs))))
                         (setq systems nil
                               charsets (list cs))))))
               charsets))
-       ;; Otherwise we're not multibyte, we're XEmacs or a single
+       ;; Otherwise we're not multibyte, we're XEmacs, or a single
        ;; coding system won't cover it.
        (setq charsets
              (mm-delete-duplicates

diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index 5b311a3..a92701f 100644 (file)
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -267,6 +267,7 @@ The buffer may be narrowed."
   ;; arg of `make-syntax-table':
 ;;   (let ((table (make-char-table 'syntax-table '(2))))
   (let ((table (make-syntax-table)))
+    ;; N.b. this currently doesn't work in Emacs 22.
     (map-char-table (lambda (k v) (modify-syntax-entry k "w" table)) table)
     (modify-syntax-entry ?\\ "\\" table)
     (modify-syntax-entry ?\" "\"" table)
@@ -311,7 +312,7 @@ Dynamically bind `rfc2047-encoding-type' to change that."
              (while (not (eobp))
                (setq start (point))
                ;; Skip whitespace.
-               (unless (= 0 (skip-chars-forward " \t"))
+               (unless (= 0 (skip-chars-forward " \t\n"))
                  (setq start (point)))
                (cond
                 ((not (char-after)))   ; eob

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 1e7b895..eb0c8e4 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-07  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus.texi (MIME Commands): Fix typo.
+
 2003-05-05  Jesper Harder  <harder@ifa.au.dk>
 
        * gnusref.tex: Additions.

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 33dd8a3..e9e7514 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -9215,7 +9215,7 @@ To have all Vcards be ignored, you'd say something like this:
 
 @item gnus-article-loose-mime
 @vindex gnus-article-loose-mime
-If non-@code{nil}, Gnus won't required the @samp{MIME-Version} header
+If non-@code{nil}, Gnus won't require the @samp{MIME-Version} header
 before interpreting the message as a @acronym{MIME} message.  This helps
 when reading messages from certain broken mail user agents.  The
 default is @code{nil}.