X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-html.el;h=b690a4c9b9327a6095d3231605245d88d5ae450a;hb=e2aa14e5654094e9e8dc4434192bab7f8974e0f7;hp=79e75f670cc6f95737adb7299a089f23c3bb5ba9;hpb=584ffb4d39c1b9ffeb8083a8b4fb62d5d3af1a80;p=elisp%2Ftm.git

diff --git a/tm-html.el b/tm-html.el
index 79e75f6..b690a4c 100644
--- a/tm-html.el
+++ b/tm-html.el
@@ -1,12 +1,33 @@
 ;;;
 ;;; tm-html.el: a tm-view internal decoder for HTML
 ;;;
-;;; by MORIOKA Tomohiko <morioka@jaist.ac.jp> (1995/09/14)
+;;; Copyright (C) 1995 Free Software Foundation, Inc.
+;;; Copyright (C) 1995,1996 MORIOKA Tomohiko
 ;;;
-;;; based on tm-latex.el by OKABE Yasuo <okabe@kudpc.kyoto-u.ac.jp>
+;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;;; Created: 1995/9/14
+;;;    based on tm-latex.el by OKABE Yasuo <okabe@kudpc.kyoto-u.ac.jp>
+;;; Version:
+;;;	$Id: tm-html.el,v 7.6 1996/05/27 08:00:50 morioka Exp $
+;;; Keywords: mail, news, MIME, multimedia, HTML, WWW
 ;;;
-;;; $Id: tm-html.el,v 7.2 1995/11/17 13:11:36 morioka Exp $
+;;; This file is part of tm (Tools for MIME).
 ;;;
+;;; This program 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.
+;;;
+;;; This program 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 This program.  If not, write to the Free Software
+;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;;;
+;;; Code:
 
 (require 'tm-view)
 
@@ -16,7 +37,7 @@
 	 (name (or (cdr (assoc "name" cal))
 		   (cdr (assoc "x-name" cal))
 		   (concat (make-temp-name "tm") ".html")))
-	 (encoding (cdr (assoc "encoding" cal)))
+	 (encoding (cdr (assq 'encoding cal)))
 	 ;; modified by Shuhei KOBAYASHI <shuhei@cmpt01.phys.tohoku.ac.jp>
 	 ;;	1995/11/17 (cf. [tm-ja:1117])
          (html-helper-build-new-buffer nil)
@@ -34,13 +55,14 @@
 	    (re-search-forward "^$")
 	    (append-to-buffer new-buf (+ (match-end 0) 1) end)
 	    )))
-    (mime/decode-region encoding (point-min)(point-max))
+    (mime-decode-region (point-min)(point-max) encoding)
     (run-hooks 'mime-article/decode-html-hook)
     ))
 
 (set-atype 'mime/content-decoding-condition
 	   '((type . "text/html")
 	     (method . mime-article/decode-html)
+	     (mode . "extract")
 	     ))
 
 
@@ -48,3 +70,5 @@
 ;;;
 
 (provide 'tm-html)
+
+;;; end of tm-html.el