X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=emh.el;h=2da44353fa3e46d73bae8542c14ea28befb6b016;hb=9b10412a20904ef61903518db6a1b55eb4544236;hp=c2122bd0c82d328fc1ad8e9472d39ce08e63f709;hpb=6b79ed6b5a86f6b2d6882c7cb11c5006b651d81d;p=elisp%2Femh.git diff --git a/emh.el b/emh.el index c2122bd..2da4435 100644 --- a/emh.el +++ b/emh.el @@ -1,10 +1,10 @@ ;;; emh.el --- MIME extender for mh-e -;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc. +;; Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc. -;; Author: MORIOKA Tomohiko +;; Author: MORIOKA Tomohiko ;; OKABE Yasuo -;; Maintainer: MORIOKA Tomohiko +;; Maintainer: MORIOKA Tomohiko ;; Created: 1993/11/21 ;; Renamed: 1993/11/27 from mh-e-mime.el ;; Renamed: 1997/02/21 from tm-mh-e.el @@ -30,16 +30,14 @@ ;;; Code: (require 'mh-e) +(require 'alist) (require 'mime-view) -(or (get-unified-alist mime-acting-condition '((type . text))) - (error "Please install latest SEMI.")) -(eval-when-compile (require 'mime-text)) ;;; @ version ;;; -(defconst emh-version "1.1.3") +(defconst emh-version "1.14.1") ;;; @ variable @@ -64,6 +62,11 @@ ;;; @ functions ;;; +(defsubst emh-raw-buffer (folder-buffer) + (concat "article-" (if (bufferp folder-buffer) + (buffer-name folder-buffer) + folder-buffer))) + (defun mh-display-msg (msg-num folder &optional show-buffer mode) "Display message number MSG-NUM of FOLDER. This function uses `mime-view-mode' if MODE is not nil. If MODE is @@ -89,33 +92,27 @@ nil, `emh-automatic-mime-preview' is used as default value." (setq buffer-read-only nil) (erase-buffer) (if mode - (let* ((aname (concat "article-" folder)) - (abuf (get-buffer aname)) - ) + (let* ((aname (emh-raw-buffer folder)) + (abuf (get-buffer aname))) (if abuf (progn (set-buffer abuf) (setq buffer-read-only nil) - (erase-buffer) - ) + (erase-buffer)) (setq abuf (get-buffer-create aname)) (set-buffer abuf) - ) - (let ((coding-system-for-read 'raw-text)) - (insert-file-contents msg-filename) - ) + (set-buffer-multibyte nil)) + (8bit-insert-encoded-file msg-filename) (set-buffer-modified-p nil) (setq buffer-read-only t) (setq buffer-file-name msg-filename) (mh-show-mode) - (mime-view-mode nil nil nil - aname (concat "show-" folder)) - (goto-char (point-min)) - ) + (mime-display-message (mime-open-entity 'buffer aname) + (concat "show-" folder)) + (goto-char (point-min))) (let ((clean-message-header mh-clean-message-header) (invisible-headers mh-invisible-headers) - (visible-headers mh-visible-headers) - ) + (visible-headers mh-visible-headers)) ;; 1995/9/21 ;; modified by ARIURA ;; to support mhl. @@ -135,8 +132,7 @@ nil, `emh-automatic-mime-preview' is used as default value." (t (mh-start-of-uncleaned-message))) (if emh-decode-encoded-word - (eword-decode-header) - ) + (mime-decode-header-in-buffer)) (set-buffer-modified-p nil) (setq buffer-read-only t) (setq buffer-file-name msg-filename) @@ -178,13 +174,10 @@ With arg, turn MIME processing on if arg is positive." (if (null arg) (not emh-automatic-mime-preview) arg)) - (save-excursion - (set-buffer mh-show-buffer) - (if (null emh-automatic-mime-preview) - (if (and mime-raw-buffer - (get-buffer mime-raw-buffer)) - (kill-buffer mime-raw-buffer) - ))) + (let ((raw-buffer (emh-raw-buffer (current-buffer)))) + (if (get-buffer raw-buffer) + (kill-buffer raw-buffer) + )) (mh-invalidate-show-buffer) (mh-show (mh-get-msg-num t)) ) @@ -198,7 +191,8 @@ With arg, turn MIME processing on if arg is positive." (defun emh-header-display () (interactive) (mh-invalidate-show-buffer) - (let ((mime-view-ignored-field-regexp "^:$") + (let (mime-view-ignored-field-list + mime-view-visible-field-list emh-decode-encoded-word) (mh-header-display) )) @@ -229,32 +223,21 @@ digest are inserted into the folder after that message." ;;; @ for mime-view ;;; -(set-alist 'mime-raw-buffer-coding-system-alist - 'mh-show-mode 'no-conversion) - -(set-alist 'mime-text-decoder-alist - 'mh-show-mode 'mime-text-decode-buffer) - -(defvar emh-content-header-filter-hook - (if window-system - '(emh-highlight-header) - ) +(defvar emh-display-header-hook (if window-system '(emh-highlight-header)) "Hook for header filtering.") (autoload 'emh-highlight-header "emh-face") -(defun emh-content-header-filter () - "Header filter for mime-view. -It is registered to variable `mime-view-content-header-filter-alist'." - (goto-char (point-min)) - (mime-view-cut-header) - (eword-decode-header default-mime-charset) - (run-hooks 'emh-content-header-filter-hook) +(defun emh-header-presentation-method (entity situation) + (mime-insert-header entity + mime-view-ignored-field-list + mime-view-visible-field-list) + (run-hooks 'emh-display-header-hook) ) -(set-alist 'mime-view-content-header-filter-alist - 'mh-show-mode - (function emh-content-header-filter)) +(set-alist 'mime-header-presentation-method-alist + 'mh-show-mode #'emh-header-presentation-method) + (defun emh-quitting-method () (let ((buf (current-buffer))) @@ -271,9 +254,7 @@ It is registered to variable `mime-view-content-header-filter-alist'." (set-alist 'mime-preview-quitting-method-alist 'mh-show-mode #'emh-quitting-method) -(set-alist 'mime-view-show-summary-method - 'mh-show-mode - (function emh-quitting-method)) + (defun emh-following-method (buf) (save-excursion @@ -289,38 +270,43 @@ It is registered to variable `mime-view-content-header-filter-alist'." (goto-char last) ))) -(set-alist 'mime-view-following-method-alist - 'mh-show-mode - (function emh-following-method)) +(set-alist 'mime-preview-following-method-alist + 'mh-show-mode #'emh-following-method) ;;; @@ for mime-partial ;;; -(autoload 'mime-method-to-combine-message/partial-pieces +(defun emh-request-partial-message () + (let ((msg-filename (mh-msg-filename (mh-get-msg-num t))) + (show-buffer mh-show-buffer)) + (set-buffer (get-buffer-create " *Partial Article*")) + (erase-buffer) + (setq mime-preview-buffer show-buffer) + (raw-text-insert-file-contents msg-filename) + (mime-parse-buffer) + )) + +(defun emh-get-folder-buffer () + (let ((buffer-name (buffer-name (current-buffer)))) + (and (or (string-match "^article-\\(.+\\)$" buffer-name) + (string-match "^show-\\(.+\\)$" buffer-name)) + (substring buffer-name + (match-beginning 1) (match-end 1)) + ))) + +(autoload 'mime-combine-message/partial-pieces-automatically "mime-partial" "Internal method to combine message/partial messages automatically.") -(set-atype 'mime-acting-condition - '((type . message)(subtype . partial) - (method . mime-method-to-combine-message/partial-pieces) - (major-mode . mh-show-mode) - (summary-buffer-exp - . (and (or (string-match "^article-\\(.+\\)$" - article-buffer) - (string-match "^show-\\(.+\\)$" article-buffer)) - (substring article-buffer - (match-beginning 1) (match-end 1)) - )) - )) - -(set-alist 'mime-view-partial-message-method-alist - 'mh-show-mode - (function - (lambda () - (let ((emh-automatic-mime-preview t)) - (emh-show) - )))) +(mime-add-condition + 'action + '((type . message)(subtype . partial) + (major-mode . mh-show-mode) + (method . mime-combine-message/partial-pieces-automatically) + (summary-buffer-exp . (emh-get-folder-buffer)) + (request-partial-message-method . emh-request-partial-message) + )) ;;; @ set up