X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fmm-encode.el;h=c3febb01a0f9130d9dcfcae863a5d29fe6724f9f;hp=14b2ae331af8eb4586c8af0a51c77d1c911b2419;hb=4701091fb20fe41f824040bd0ce4513a58b00468;hpb=7d2a8e20e91f8d639f94f0155631f02def66fe12 diff --git a/lisp/mm-encode.el b/lisp/mm-encode.el index 14b2ae331..c3febb01a 100644 --- a/lisp/mm-encode.el +++ b/lisp/mm-encode.el @@ -1,25 +1,23 @@ ;;; mm-encode.el --- Functions for encoding MIME things -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. + +;; Copyright (C) 1998-2012 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko ;; This file is part of GNU Emacs. -;; GNU Emacs is free software; you can redistribute it and/or modify +;; 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. +;; the Free Software Foundation, either version 3 of the License, 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 +;; 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., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: @@ -27,22 +25,24 @@ (eval-when-compile (require 'cl)) (require 'mail-parse) -(require 'mailcap) -(eval-and-compile - (autoload 'mm-body-7-or-8 "mm-bodies") - (autoload 'mm-long-lines-p "mm-bodies")) +(autoload 'mailcap-extension-to-mime "mailcap") +(autoload 'mm-body-7-or-8 "mm-bodies") +(autoload 'mm-long-lines-p "mm-bodies") (defcustom mm-content-transfer-encoding-defaults '(("text/x-patch" 8bit) ("text/.*" qp-or-base64) ("message/rfc822" 8bit) - ("application/emacs-lisp" 8bit) - ("application/x-emacs-lisp" 8bit) - ("application/x-patch" 8bit) + ("application/emacs-lisp" qp-or-base64) + ("application/x-emacs-lisp" qp-or-base64) + ("application/x-patch" qp-or-base64) (".*" base64)) "Alist of regexps that match MIME types and their encodings. If the encoding is `qp-or-base64', then either quoted-printable -or base64 will be used, depending on what is more efficient." +or base64 will be used, depending on what is more efficient. + +This list is only consulted when encoding MIME parts in the +bodies -- not for the regular non-MIME-ish messages." :type '(repeat (list (regexp :tag "MIME type") (choice :tag "encoding" (const 7bit) @@ -52,6 +52,24 @@ or base64 will be used, depending on what is more efficient." (const base64)))) :group 'mime) +(defcustom mm-sign-option nil + "Option how to create signed parts. +nil, use the default keys without asking; +`guided', let you select signing keys from the menu." + :version "23.2" ;; No Gnus 0.12 + :type '(choice (item guided) + (item :tag "default" nil)) + :group 'mime-security) + +(defcustom mm-encrypt-option nil + "Option how to create encrypted parts. +nil, use the default keys without asking; +`guided', let you select recipients' keys from the menu." + :version "23.2" ;; No Gnus 0.12 + :type '(choice (item guided) + (item :tag "default" nil)) + :group 'mime-security) + (defvar mm-use-ultra-safe-encoding nil "If non-nil, use encodings aimed at Procrustean bed survival. @@ -79,20 +97,26 @@ This variable should never be set directly, but bound before a call to (insert "Content-Type: multipart/mixed; boundary=\"" boundary "\"\n") boundary)) +;;;###autoload (defun mm-default-file-encoding (file) "Return a default encoding for FILE." (if (not (string-match "\\.[^.]+$" file)) "application/octet-stream" (mailcap-extension-to-mime (match-string 0 file)))) -(defun mm-safer-encoding (encoding) +(defun mm-safer-encoding (encoding &optional type) "Return an encoding similar to ENCODING but safer than it." (cond ((eq encoding '7bit) '7bit) ;; 7bit is considered safe. - ((memq encoding '(8bit quoted-printable)) 'quoted-printable) + ((memq encoding '(8bit quoted-printable)) + ;; According to RFC2046, 5.2.1, RFC822 Subtype, "quoted-printable" is not + ;; a valid encoding for message/rfc822: + ;; No encoding other than "7bit", "8bit", or "binary" is permitted for the + ;; body of a "message/rfc822" entity. + (if (string= type "message/rfc822") '8bit 'quoted-printable)) ;; The remaining encodings are binary and base64 (and perhaps some ;; non-standard ones), which are both turned into base64. - (t 'base64))) + (t (if (string= type "message/rfc822") 'binary 'base64)))) (defun mm-encode-content-transfer-encoding (encoding &optional type) "Encode the current buffer with ENCODING for MIME type TYPE. @@ -107,7 +131,7 @@ ENCODING can be: nil (do nothing); one of `quoted-printable', `base64'; ;; Likewise base64 below. (quoted-printable-encode-region (point-min) (point-max) t)) ((eq encoding 'base64) - (when (equal type "text/plain") + (when (string-match "\\`text/" type) (goto-char (point-min)) (while (search-forward "\n" nil t) (replace-match "\r\n" t t))) @@ -124,22 +148,19 @@ ENCODING can be: nil (do nothing); one of `quoted-printable', `base64'; (t (error "Unknown encoding %s" encoding)))) -(defun mm-encode-buffer (type) - "Encode the buffer which contains data of MIME type TYPE. +(defun mm-encode-buffer (type &optional encoding) + "Encode the buffer which contains data of MIME type TYPE by ENCODING. TYPE is a string or a list of the components. +The optional ENCODING overrides the encoding determined according to +TYPE and `mm-content-transfer-encoding-defaults'. The encoding used is returned." - (let* ((mime-type (if (stringp type) type (car type))) - (encoding - (or (and (listp type) - (cadr (assq 'encoding type))) - (mm-content-transfer-encoding mime-type))) - (bits (mm-body-7-or-8))) - ;; We force buffers that are 7bit to be unencoded, no matter - ;; what the preferred encoding is. - ;; Only if the buffers don't contain lone lines. - (when (and (eq bits '7bit) (not (mm-long-lines-p 76))) - (setq encoding bits)) - (mm-encode-content-transfer-encoding encoding mime-type) + (let ((mime-type (if (stringp type) type (car type)))) + (mm-encode-content-transfer-encoding + (or encoding + (setq encoding (or (and (listp type) + (cadr (assq 'encoding type))) + (mm-content-transfer-encoding mime-type)))) + mime-type) encoding)) (defun mm-insert-headers (type encoding &optional file) @@ -167,7 +188,7 @@ The encoding used is returned." (mm-qp-or-base64) (cadr (car rules))))) (if mm-use-ultra-safe-encoding - (mm-safer-encoding encoding) + (mm-safer-encoding encoding type) encoding)))) (pop rules))))) @@ -195,5 +216,4 @@ This is either `base64' or `quoted-printable'." (provide 'mm-encode) -;;; arch-tag: 7d01bba4-d469-4851-952b-dc863f84ed66 ;;; mm-encode.el ends here