`mime/token-regexp' -> `mime-token-regexp'.

[elisp/semi.git] / mime-text.el

diff --git a/mime-text.el b/mime-text.el
index 972fcaa..0e705f7 100644 (file)
--- a/mime-text.el
+++ b/mime-text.el
@@ -3,8 +3,7 @@
 ;; Copyright (C) 1994,1995,1996,1997 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version:
-;;     $Id: mime-text.el,v 0.21 1997-03-18 09:48:25 morioka Exp $
+;; Version: $Id: mime-text.el,v 0.24 1997-07-02 16:20:22 morioka Exp $
 ;; Keywords: text, MIME, multimedia, mail, news
 
 ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces).
@@ -86,9 +85,13 @@ CHARSET.  CHARSET is SYMBOL and ENCODING is nil or STRING.
 It calls text decoder for MIME charset specified by buffer local
 variable `mime-text-decoder' and variable `mime-text-decoder-alist'."
   (mime-decode-region (point-min) (point-max) encoding)
+  (goto-char (point-min))
+  (while (search-forward "\r\n" nil t)
+    (replace-match "\n")
+    )
   (let ((text-decoder
         (save-excursion
-          (set-buffer mime::preview/article-buffer)
+          (set-buffer mime-raw-buffer)
           (or mime-text-decoder
               (cdr (or (assq major-mode mime-text-decoder-alist)
                        (assq t mime-text-decoder-alist)))
@@ -121,7 +124,7 @@ variable `mime-text-decoder' and variable `mime-text-decoder-alist'."
 ;;; @ content filters for mime-text
 ;;;
 
-(defun mime-preview/filter-for-text/plain (ctype params encoding)
+(defun mime-view-filter-for-text/plain (ctype params encoding)
   (mime-decode-text-body (cdr (assoc "charset" params)) encoding)
   (goto-char (point-max))
   (if (not (eq (char-after (1- (point))) ?\n))
@@ -140,7 +143,7 @@ variable `mime-text-decoder' and variable `mime-text-decoder-alist'."
   (run-hooks 'mime-view-plain-text-preview-hook)
   )
 
-(defun mime-preview/filter-for-text/richtext (ctype params encoding)
+(defun mime-view-filter-for-text/richtext (ctype params encoding)
   (let* ((charset (cdr (assoc "charset" params)))
         (beg (point-min))
         )
@@ -149,7 +152,7 @@ variable `mime-text-decoder' and variable `mime-text-decoder-alist'."
     (richtext-decode beg (point-max))
     ))
 
-(defun mime-preview/filter-for-text/enriched (ctype params encoding)
+(defun mime-view-filter-for-text/enriched (ctype params encoding)
   (let* ((charset (cdr (assoc "charset" params)))
         (beg (point-min))
         )