Mercurial > emacs
view lisp/gnus/rfc2231.el @ 65719:5265a4059126
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-564
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 125-127)
- Merge from emacs--cvs-trunk--0
- Update from CVS
2005-09-27 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/mm-uu.el (mm-uu-emacs-sources-regexp): Make variable
customizable. Change default value.
(mm-uu-diff-groups-regexp): Change default value.
(mm-uu-type-alist): Added doc string.
(mm-uu-configure): Added doc string. Make it interactive.
(mm-uu-diff-groups-regexp): Fix missing quotes from previous
commit.
2005-09-27 Simon Josefsson <jas@extundo.com>
* lisp/gnus/message.el (message-idna-to-ascii-rhs-1): Reformat.
2005-09-27 Arne J,Ax(Brgensen <arne@arnested.dk>
* lisp/gnus/message.el (message-remove-duplicates): New function.
Implementation borrowed from `gnus-remove-duplicates'.
(message-idna-to-ascii-rhs): Also encode idna addresses in
Reply-To:, Mail-Reply-To: and Mail-Followup-To:.
(message-idna-to-ascii-rhs-1): When `message-use-idna' is 'ask
only ask about the same idna domain once per header and also tell
in what header to replace the idna domain.
* lisp/gnus/gnus-art.el (article-decode-idna-rhs): Also decode idna
addresses in Reply-To:, Mail-Reply-To: and Mail-Followup-To:.
(article-decode-idna-rhs): Fix regexp so that all idna-address in
a header is decoded and not just the last one.
2005-09-27 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-art.el (gnus-mime-display-single): Don't modify text if it
has been decoded.
* lisp/gnus/mm-decode.el (mm-insert-part): Don't modify text if it has been
decoded.
* lisp/gnus/mm-view.el (mm-inline-text): Don't strip text props unless
decoding enriched or richtext parts.
2005-09-26 Katsumi Yamaoka <yamaoka@jpl.org>
* man/gnus.texi (Server Buffer Format): Document the %a format spec.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 28 Sep 2005 05:26:02 +0000 |
parents | fafd692d1e40 |
children | 28264c86d408 2d92f5c9d6ae |
line wrap: on
line source
;;; rfc2231.el --- Functions for decoding rfc2231 headers ;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, ;; 2005 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org> ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. ;;; Commentary: ;;; Code: (eval-when-compile (require 'cl)) (require 'ietf-drums) (require 'rfc2047) (autoload 'mm-encode-body "mm-bodies") (autoload 'mail-header-remove-whitespace "mail-parse") (autoload 'mail-header-remove-comments "mail-parse") (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 `(name (attribute . value) (attribute . value)...)" (with-temp-buffer (let ((ttoken (ietf-drums-token-to-list ietf-drums-text-token)) (stoken (ietf-drums-token-to-list ietf-drums-tspecials)) (ntoken (ietf-drums-token-to-list "0-9")) (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))) (modify-syntax-entry ?\' "w" table) (modify-syntax-entry ?* " " table) (modify-syntax-entry ?\; " " table) (modify-syntax-entry ?= " " table) ;; The following isn't valid, but one should be liberal ;; in what one receives. (modify-syntax-entry ?\: "w" table) (set-syntax-table table)) (setq c (char-after)) (when (and (memq c ttoken) (not (memq c stoken))) (setq type (downcase (buffer-substring (point) (progn (forward-sexp 1) (point))))) ;; Do the params (while (not (eobp)) (setq c (char-after)) (unless (eq c ?\;) (error "Invalid header: %s" string)) (forward-char 1) ;; If c in nil, then this is an invalid header, but ;; since elm generates invalid headers on this form, ;; we allow it. (when (setq c (char-after)) (if (and (memq c ttoken) (not (memq c stoken))) (setq attribute (intern (downcase (buffer-substring (point) (progn (forward-sexp 1) (point)))))) (error "Invalid header: %s" string)) (setq c (char-after)) (when (eq c ?*) (forward-char 1) (setq c (char-after)) (if (not (memq c ntoken)) (setq encoded t number nil) (setq number (string-to-number (buffer-substring (point) (progn (forward-sexp 1) (point))))) (setq c (char-after)) (when (eq c ?*) (setq encoded t) (forward-char 1) (setq c (char-after))))) ;; 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) (setq c (char-after)) (cond ((eq c ?\") (setq value (buffer-substring (1+ (point)) (progn (forward-sexp 1) (1- (point)))))) ((and (or (memq c ttoken) (> c ?\177)) ;; EXTENSION: Support non-ascii chars. (not (memq c stoken))) (setq value (buffer-substring (point) (progn (forward-sexp) (point))))) (t (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) value)) parameters)))) ;; 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)) (when type `(,type ,@(nreverse parameters))))))) (defun rfc2231-decode-encoded-string (string) "Decode an RFC2231-encoded string. These look like \"us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A\"." (with-temp-buffer (let ((elems (split-string string "'"))) ;; The encoded string may contain zero to two single-quote ;; marks. This should give us the encoded word stripped ;; of any preceding values. (insert (car (last elems))) (goto-char (point-min)) (while (search-forward "%" nil t) (insert (prog1 (string-to-number (buffer-substring (point) (+ (point) 2)) 16) (delete-region (1- (point)) (+ (point) 2))))) ;; Encode using the charset, if any. (when (and (mm-multibyte-p) (> (length elems) 1) (not (equal (intern (downcase (car elems))) 'us-ascii))) (mm-decode-coding-region (point-min) (point-max) (intern (downcase (car elems))))) (buffer-string)))) (defun rfc2231-encode-string (param value) "Return and PARAM=VALUE string encoded according to RFC2231." (let ((control (ietf-drums-token-to-list ietf-drums-no-ws-ctl-token)) (tspecial (ietf-drums-token-to-list ietf-drums-tspecials)) (special (ietf-drums-token-to-list "*'%\n\t")) (ascii (ietf-drums-token-to-list ietf-drums-text-token)) (num -1) spacep encodep charsetp charset broken) (with-temp-buffer (insert value) (goto-char (point-min)) (while (not (eobp)) (cond ((or (memq (following-char) control) (memq (following-char) tspecial) (memq (following-char) special)) (setq encodep t)) ((eq (following-char) ? ) (setq spacep t)) ((not (memq (following-char) ascii)) (setq charsetp t))) (forward-char 1)) (when charsetp (setq charset (mm-encode-body))) (cond ((or encodep charsetp) (goto-char (point-min)) (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 (insert "%" (format "%02x" (following-char))) (delete-char 1)) (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)) (insert (if (>= num 0) " " "\n ") param "*" (format "%d" (incf num)) "*=") (forward-line 1)))) (spacep (goto-char (point-min)) (insert param "=\"") (goto-char (point-max)) (insert "\"")) (t (goto-char (point-min)) (insert param "="))) (buffer-string)))) (provide 'rfc2231) ;;; arch-tag: c3ab751d-d108-406a-b301-68882ad8cd63 ;;; rfc2231.el ends here