[Emacs-diffs] Changes to emacs/lisp/gnus/rfc2231.el

[Miles Bader]

Index: emacs/lisp/gnus/rfc2231.el
diff -c emacs/lisp/gnus/rfc2231.el:1.8 emacs/lisp/gnus/rfc2231.el:1.9
*** emacs/lisp/gnus/rfc2231.el:1.8      Mon Jul  4 17:55:17 2005
--- emacs/lisp/gnus/rfc2231.el  Fri Jul 29 01:44:40 2005
***************
*** 1,6 ****
  ;;; rfc2231.el --- Functions for decoding rfc2231 headers
  
! ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004
  ;;        Free Software Foundation, Inc.
  
  ;; Author: Lars Magne Ingebrigtsen <address@hidden>
--- 1,6 ----
  ;;; rfc2231.el --- Functions for decoding rfc2231 headers
  
! ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005
  ;;        Free Software Foundation, Inc.
  
  ;; Author: Lars Magne Ingebrigtsen <address@hidden>
***************
*** 52,58 ****
          (prev-value "")
          display-name mailbox c display-string parameters
          attribute value type subtype number encoded
!         prev-attribute)
        (ietf-drums-init (mail-header-remove-whitespace
                        (mail-header-remove-comments string)))
        (let ((table (copy-syntax-table ietf-drums-syntax-table)))
--- 52,58 ----
          (prev-value "")
          display-name mailbox c display-string parameters
          attribute value type subtype number encoded
!         prev-attribute prev-encoded)
        (ietf-drums-init (mail-header-remove-whitespace
                        (mail-header-remove-comments string)))
        (let ((table (copy-syntax-table ietf-drums-syntax-table)))
***************
*** 106,114 ****
            ;; See if we have any previous continuations.
            (when (and prev-attribute
                       (not (eq prev-attribute attribute)))
!             (push (cons prev-attribute prev-value) parameters)
              (setq prev-attribute nil
!                   prev-value ""))
            (unless (eq c ?=)
              (error "Invalid header: %s" string))
            (forward-char 1)
--- 106,119 ----
            ;; See if we have any previous continuations.
            (when (and prev-attribute
                       (not (eq prev-attribute attribute)))
!             (push (cons prev-attribute
!                         (if prev-encoded
!                             (rfc2231-decode-encoded-string prev-value)
!                           prev-value))
!                   parameters)
              (setq prev-attribute nil
!                   prev-value ""
!                   prev-encoded nil))
            (unless (eq c ?=)
              (error "Invalid header: %s" string))
            (forward-char 1)
***************
*** 127,133 ****
              (error "Invalid header: %s" string)))
            (if number
                (setq prev-attribute attribute
!                     prev-value (concat prev-value value))
              (push (cons attribute
                          (if encoded
                              (rfc2231-decode-encoded-string value)
--- 132,139 ----
              (error "Invalid header: %s" string)))
            (if number
                (setq prev-attribute attribute
!                     prev-value (concat prev-value value)
!                     prev-encoded encoded)
              (push (cons attribute
                          (if encoded
                              (rfc2231-decode-encoded-string value)
***************
*** 137,143 ****
        ;; Take care of any final continuations.
        (when prev-attribute
          (push (cons prev-attribute
!                     (if encoded
                          (rfc2231-decode-encoded-string prev-value)
                        prev-value))
                parameters))
--- 143,149 ----
        ;; Take care of any final continuations.
        (when prev-attribute
          (push (cons prev-attribute
!                     (if prev-encoded
                          (rfc2231-decode-encoded-string prev-value)
                        prev-value))
                parameters))