Importing Oort Gnus v0.03.

[elisp/gnus.git-] / lisp / rfc2231.el

diff --git a/lisp/rfc2231.el b/lisp/rfc2231.el
index 8ee24b9..dd391b1 100644 (file)
--- a/lisp/rfc2231.el
+++ b/lisp/rfc2231.el
@@ -1,5 +1,6 @@
 ;;; rfc2231.el --- Functions for decoding rfc2231 headers
-;; Copyright (C) 1998,99 Free Software Foundation, Inc.
+
+;; Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -23,12 +24,19 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
 (require 'ietf-drums)
+(require 'rfc2047)
 
 (defun rfc2231-get-value (ct attribute)
   "Return the value of ATTRIBUTE from CT."
   (cdr (assq attribute (cdr ct))))
 
+(defun rfc2231-parse-qp-string (string)
+  "Parse QP-encoded string using `rfc2231-parse-string'.
+N.B.  This is in violation with RFC2047, but it seem to be in common use."
+  (rfc2231-parse-string (rfc2047-decode-string string)))
+
 (defun rfc2231-parse-string (string)
   "Parse STRING and return a list.
 The list will be on the form
@@ -77,7 +85,9 @@ The list will be on the form
            (when (eq c ?*)
              (forward-char 1)
              (setq c (char-after))
-             (when (memq c ntoken)
+             (if (not (memq c ntoken))
+                 (setq encoded t
+                       number nil)
                (setq number
                      (string-to-number
                       (buffer-substring
@@ -138,7 +148,8 @@ These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"."
             (string-to-number (buffer-substring (point) (+ (point) 2)) 16)
           (delete-region (1- (point)) (+ (point) 2)))))
       ;; Encode using the charset, if any.
-      (when (and (< (length elems) 1)
+      (when (and (mm-multibyte-p)
+                (> (length elems) 1)
                 (not (equal (intern (car elems)) 'us-ascii)))
        (mm-decode-coding-region (point-min) (point-max)
                                 (intern (car elems))))
@@ -173,7 +184,7 @@ These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"."
        (goto-char (point-min))
        (while (not (eobp))
          (when (> (current-column) 60)
-           (insert "\n")
+           (insert ";\n")
            (setq broken t))
          (if (or (not (memq (following-char) ascii))
                  (memq (following-char) control)
@@ -185,12 +196,13 @@ These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"."
                (delete-char 1))
            (forward-char 1)))
        (goto-char (point-min))
-       (insert (or charset "ascii") "''")
+       (insert (symbol-name (or charset 'us-ascii)) "''")
        (goto-char (point-min))
        (if (not broken)
            (insert param "*=")
          (while (not (eobp))
-           (insert param "*" (format "%d" (incf num)) "*=")
+           (insert (if (>= num 0) " " "\n ")
+                   param "*" (format "%d" (incf num)) "*=")
            (forward-line 1))))
        (spacep
        (goto-char (point-min))