X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fmm-encode.el;h=c6ca4c40d04d14c48bf637a0dec86bd0602b8a79;hb=c0e99c20aedaa1aacfe91ee6f1679eedb508368a;hp=d4f9ea76006943973c5986968f8705dc5ed229ea;hpb=d61550e80bccf607ec141be5a25df88fa8f4ac8e;p=gnus

diff --git a/lisp/mm-encode.el b/lisp/mm-encode.el
index d4f9ea760..c6ca4c40d 100644
--- a/lisp/mm-encode.el
+++ b/lisp/mm-encode.el
@@ -1,7 +1,7 @@
 ;;; mm-encode.el --- Functions for encoding MIME things
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -26,7 +26,7 @@
 
 (eval-when-compile (require 'cl))
 (require 'mail-parse)
-(require 'mailcap)
+(autoload 'mailcap-extension-to-mime "mailcap")
 (autoload 'mm-body-7-or-8 "mm-bodies")
 (autoload 'mm-long-lines-p "mm-bodies")
 
@@ -64,7 +64,7 @@ to specify encoding of non-ASCII MIME parts."
   "Option how to create signed parts.
 nil, use the default keys without asking;
 `guided', let you select signing keys from the menu."
-  :version "23.1"
+  :version "23.2" ;; No Gnus 0.12
   :type '(choice (item guided)
 		 (item :tag "default" nil))
   :group 'mime-security)
@@ -73,7 +73,7 @@ nil, use the default keys without asking;
   "Option how to create encrypted parts.
 nil, use the default keys without asking;
 `guided', let you select recipients' keys from the menu."
-  :version "23.1"
+  :version "23.2" ;; No Gnus 0.12
   :type '(choice (item guided)
 		 (item :tag "default" nil))
   :group 'mime-security)
@@ -223,5 +223,4 @@ This is either `base64' or `quoted-printable'."
 
 (provide 'mm-encode)
 
-;; arch-tag: 7d01bba4-d469-4851-952b-dc863f84ed66
 ;;; mm-encode.el ends here