Revision: emacs@sv.gnu.org/emacs--devo--0--patch-42

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 14-17)

   - Update from CVS
   - Merge from emacs--devo--0

5 files changed, 49 insertions, 14 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 87a3f1918d6..1edd84bea48 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,24 @@
+2006-02-03  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-util.el (gnus-error): Describe `args'.
+
+2006-02-03  Andreas Seltenreich <uwi7@stud.uni-karlsruhe.de>
+
+        * nnweb.el (nnweb-request-group): Avoid growing overview files.
+
+2006-02-03  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * rfc2231.el (rfc2231-parse-string): Add missing semicolons to
+        segmented lines of parameter value to cope with Thunderbird 1.5
+        bug (cf. https://bugzilla.mozilla.org/show_bug.cgi?id=323318).
+        Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
+        (rfc2231-encode-string): Don't make lines exceeding 76 column.
+
+2006-02-01  Max Froumentin  <max@lapin-bleu.net>  (tiny change)
+
+        * mml.el (mml-generate-mime-1): Correct the order of inline signed
+        parts.
+
 2006-01-31  Andreas Seltenreich <uwi7@stud.uni-karlsruhe.de>
 
         * nnweb.el (nnweb-group-alist): Use defvar instead of defvoo,
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index f7fb279f20f..c71b9630db2 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -497,7 +497,8 @@ inside loops."
     (apply 'format args)))
 
 (defun gnus-error (level &rest args)
-  "Beep an error if LEVEL is equal to or less than `gnus-verbose'."
+  "Beep an error if LEVEL is equal to or less than `gnus-verbose'.
+ARGS are passed to `message'."
   (when (<= (floor level) gnus-verbose)
     (apply 'message args)
     (ding)
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 90f7c5f09dd..f8c34b370d6 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -1,7 +1,7 @@
 ;;; mml.el --- A package for parsing and validating MML documents
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -578,7 +578,8 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
                   ;; Skip `multipart' and attributes.
                   (when (and (consp part) (consp (cdr part)))
                     (insert "\n--" mml-boundary "\n")
-                    (mml-generate-mime-1 part))))
+                    (mml-generate-mime-1 part)
+                    (goto-char (point-max)))))
               (insert "\n--" mml-boundary "--\n")))))
        (t
         (error "Invalid element: %S" cont)))
diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el
index 4723a694182..bf49aba7f08 100644
--- a/lisp/gnus/nnweb.el
+++ b/lisp/gnus/nnweb.el
@@ -133,7 +133,8 @@ Valid types include `google', `dejanews', and `gmane'.")
 (deffoo nnweb-request-group (group &optional server dont-check)
   (nnweb-possibly-change-server group server)
   (unless (or nnweb-ephemeral-p
-              dont-check)
+              dont-check
+              nnweb-articles)
     (nnweb-read-overview group))
   (cond
    ((not nnweb-articles)
diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el
index df9a5b7bd82..fb2d070328e 100644
--- a/lisp/gnus/rfc2231.el
+++ b/lisp/gnus/rfc2231.el
@@ -1,7 +1,7 @@
 ;;; rfc2231.el --- Functions for decoding rfc2231 headers
 
-;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004,
-;;   2005 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005,
+;;   2006 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -53,6 +53,10 @@ The list will be on the form
           display-name mailbox c display-string parameters
           attribute value type subtype number encoded
           prev-attribute prev-encoded)
+      ;; Some mailer (e.g. Thunderbird 1.5) doesn't terminate each
+      ;; line with semicolon when folding a long parameter value.
+      (while (string-match "\\([^\t\n\r ;]\\)[\t ]*\r?\n[\t ]+" string)
+        (setq string (replace-match "\\1;\n " nil nil string)))
       (ietf-drums-init (mail-header-remove-whitespace
                         (mail-header-remove-comments string)))
       (let ((table (copy-syntax-table ietf-drums-syntax-table)))
@@ -191,6 +195,7 @@ These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"."
         (special (ietf-drums-token-to-list "*'%\n\t"))
         (ascii (ietf-drums-token-to-list ietf-drums-text-token))
         (num -1)
+        (limit (- 74 (length param)))
         spacep encodep charsetp charset broken)
     (with-temp-buffer
       (insert value)
@@ -209,24 +214,30 @@ These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"."
       (when charsetp
         (setq charset (mm-encode-body)))
       (cond
-       ((or encodep charsetp)
+       ((or encodep charsetp
+            (progn
+              (end-of-line)
+              (> (current-column) (if spacep (- limit 2) limit))))
+        (setq limit (- limit 6))
         (goto-char (point-min))
+        (insert (symbol-name (or charset 'us-ascii)) "''")
         (while (not (eobp))
-          (when (> (current-column) 60)
-            (insert ";\n")
-            (setq broken t))
           (if (or (not (memq (following-char) ascii))
                   (memq (following-char) control)
                   (memq (following-char) tspecial)
                   (memq (following-char) special)
                   (eq (following-char) ? ))
               (progn
+                (when (>= (current-column) (1- limit))
+                  (insert ";\n")
+                  (setq broken t))
                 (insert "%" (format "%02x" (following-char)))
                 (delete-char 1))
+            (when (> (current-column) limit)
+              (insert ";\n")
+              (setq broken t))
             (forward-char 1)))
         (goto-char (point-min))
-        (insert (symbol-name (or charset 'us-ascii)) "''")
-        (goto-char (point-min))
         (if (not broken)
             (insert param "*=")
           (while (not (eobp))
@@ -235,12 +246,12 @@ These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"."
             (forward-line 1))))
        (spacep
         (goto-char (point-min))
-        (insert param "=\"")
+        (insert "\n " param "=\"")
         (goto-char (point-max))
         (insert "\""))
        (t
         (goto-char (point-min))
-        (insert param "=")))
+        (insert "\n " param "=")))
       (buffer-string))))
 
 (provide 'rfc2231)