X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mmexternal.el;h=c107e648f681c3c7c990ca36da7fdbb4db41ba1e;hb=6b1e47875a18ac2c8345279d308c039c3d3f088b;hp=9da0773e8b302de1c75f40262aa9ca27967df1bd;hpb=ffbfdd7e4716650ad156fe786f07590eaf6161c4;p=elisp%2Fflim.git

diff --git a/mmexternal.el b/mmexternal.el
index 9da0773..c107e64 100644
--- a/mmexternal.el
+++ b/mmexternal.el
@@ -19,14 +19,13 @@
 
 ;; 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.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
 (require 'mmgeneric)
 (require 'mime)
-(require 'pces)
 
 (eval-and-compile
   (luna-define-class mime-external-entity (mime-entity)
@@ -79,7 +78,7 @@
 				 (concat " *Body of "
 					 (mime-entity-name entity)
 					 "*"))
-	     (insert-file-contents-as-binary
+	     (binary-insert-encoded-file
 	      (mime-external-entity-body-file-internal entity))
 	     (current-buffer))))
       (error (message "Can't get external-body.")))))
@@ -96,7 +95,8 @@
 (luna-define-method mime-write-entity ((entity mime-external-entity) filename)
   (with-temp-buffer
     (mime-insert-entity entity)
-    (write-region-as-raw-text-CRLF (point-min) (point-max) filename)))
+    (let ((coding-system-for-write 'raw-text-dos))
+      (write-region (point-min) (point-max) filename))))
 
 
 ;;; @ entity header
@@ -120,7 +120,7 @@
 					    filename)
   (mmexternal-require-buffer entity)
   (with-current-buffer (mime-external-entity-body-buffer-internal entity)
-    (write-region-as-binary (point-min) (point-max) filename)))
+    (binary-write-decoded-region (point-min) (point-max) filename)))
 
 
 ;;; @ entity content
@@ -156,8 +156,7 @@
 	(let ((ret (std11-fetch-field field-name)))
 	  (when ret
 	    (or (symbolp field-name)
-		(setq field-name
-		      (intern (capitalize (capitalize field-name)))))
+		(setq field-name (intern (capitalize field-name))))
 	    (mime-entity-set-original-header-internal
 	     entity
 	     (put-alist field-name ret