tm 7.80.

[elisp/tm.git] / tm-view.el

diff --git a/tm-view.el b/tm-view.el
index 1cb26da..b66f13d 100644 (file)
--- a/tm-view.el
+++ b/tm-view.el
@@ -1,32 +1,29 @@
-;;;
 ;;; tm-view.el --- interactive MIME viewer for GNU Emacs
-;;;
-;;; Copyright (C) 1995 Free Software Foundation, Inc.
-;;; Copyright (C) 1994 .. 1996 MORIOKA Tomohiko
-;;;
-;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;;; modified by Steven L. Baur <steve@miranova.com>
-;;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;;; Created: 1994/7/13 (1994/8/31 obsolete tm-body.el)
-;;; Version: $Revision: 7.66 $
-;;; Keywords: mail, news, MIME, multimedia
-;;;
-;;; 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.
-;;;
+
+;; Copyright (C) 1995,1996 Free Software Foundation, Inc.
+
+;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Created: 1994/7/13 (1994/8/31 obsolete tm-body.el)
+;; Version: $Revision: 7.73 $
+;; Keywords: mail, news, MIME, multimedia
+
+;; 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; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
 ;;; Code:
 
 (require 'tl-str)
@@ -45,7 +42,7 @@
 ;;;
 
 (defconst mime-viewer/RCS-ID
-  "$Id: tm-view.el,v 7.66 1996/07/01 23:42:12 morioka Exp $")
+  "$Id: tm-view.el,v 7.73 1996/08/30 16:57:53 morioka Exp $")
 
 (defconst mime-viewer/version (get-version-string mime-viewer/RCS-ID))
 (defconst mime/viewer-version mime-viewer/version)
@@ -375,7 +372,7 @@ The compressed face will be piped to this command.")
     (goto-char (point-min))
     (if (re-search-forward "^X-Face:[ \t]*" nil t)
        (let ((beg (match-end 0))
-             (end (rfc822/field-end))
+             (end (std11-field-end))
              )
          (call-process-region beg end "sh" nil 0 nil
                               "-c" mime-viewer/x-face-command)
@@ -564,8 +561,7 @@ The compressed face will be piped to this command.")
     ))
 
 (defun mime-article/get-subject (param &optional encoding)
-  (or (rfc822/get-field-body "Content-Description")
-      (rfc822/get-field-body "Subject")
+  (or (std11-find-field-body '("Content-Description" "Subject"))
       (let (ret)
        (if (or (and (setq ret (mime/Content-Disposition))
                     (setq ret (assoc "filename" (cdr ret)))
@@ -608,13 +604,12 @@ The compressed face will be piped to this command.")
   (or cinfo
       (setq cinfo mime::article/content-info)
       )
-  (some-element
-   (function
-    (lambda (ci)
-      (equal (mime::content-info/rcnum ci) rcnum)
-      ))
-   (mime/flatten-content-info cinfo)
-   ))
+  (find-if (function
+           (lambda (ci)
+             (equal (mime::content-info/rcnum ci) rcnum)
+             ))
+          (mime/flatten-content-info cinfo)
+          ))
 
 (defun mime-article/cnum-to-cinfo (cn &optional cinfo)
   (or cinfo
@@ -937,7 +932,7 @@ button-2    Move to point under the mouse cursor
                                  (mime::content-info/point-min ci)
                                  (mime::content-info/point-max ci)
                                  )
-                                (rfc822/get-header-string-except
+                                (std11-header-string-except
                                  (concat "^"
                                          (apply (function regexp-or) fields)
                                          ":") ""))))
@@ -948,7 +943,7 @@ button-2    Move to point under the mouse cursor
                             (insert str)
                           )
                         rcnum))
-               (setq fields (rfc822/get-field-names)
+               (setq fields (std11-collect-field-names)
                      rcnum (cdr rcnum))
                )
              )