X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-play.el;h=b4a03a292fc4a09bb8981845864c596a2fdf4d3f;hb=86bbd8d3d04a7b9b8a4d16f4c55a00348b025912;hp=bb5ee155b94c1a4d504ff03795c8f7ebf02db017;hpb=a91ed21703bf4c9ae5c51ce1bab7041f14e00ed3;p=elisp%2Fsemi.git diff --git a/mime-play.el b/mime-play.el index bb5ee15..b4a03a2 100644 --- a/mime-play.el +++ b/mime-play.el @@ -159,7 +159,15 @@ If MODE is specified, play as it. Default MODE is \"play\"." (interactive "P") (let ((entity (get-text-property (point) 'mime-view-entity))) (if entity - (let ((situation (list (cons 'mode (or mode "play"))))) + (let ((situation + (get-text-property (point) 'mime-view-situation))) + (or mode + (setq mode "play")) + (setq situation + (if (assq 'mode situation) + (put-alist 'mode mode (copy-alist situation)) + (cons (cons 'mode mode) + situation))) (if ignore-examples (setq situation (cons (cons 'ignore-examples ignore-examples) @@ -326,7 +334,11 @@ specified, play as it. Default MODE is \"play\"." ;; ) (t (mime-show-echo-buffer "No method are specified for %s\n" - (mime-entity-type/subtype entity)) + (mime-type/subtype-string + (cdr (assq 'type situation)) + (cdr (assq 'subtype situation)))) + (if (y-or-n-p "Do you want to save current entity to disk?") + (mime-save-content entity situation)) )) )) @@ -407,8 +419,9 @@ window.") (select-window win) (goto-char (point-max)) (if forms - (insert (apply (function format) forms)) - ) + (let ((buffer-read-only nil)) + (insert (apply (function format) forms)) + )) (select-window the-win) )) @@ -430,8 +443,8 @@ window.") (let ((filename (or (mime-entity-filename entity) (let ((subj - (or (mime-read-field 'Content-Description entity) - (mime-read-field 'Subject entity)))) + (or (mime-entity-read-field entity 'Content-Description) + (mime-entity-read-field entity 'Subject)))) (if (and subj (or (string-match mime-view-file-name-regexp-1 subj) (string-match mime-view-file-name-regexp-2 subj))) @@ -500,16 +513,14 @@ SUBTYPE is symbol to indicate subtype of media-type.") ) t))) (setq rest (cdr rest)))) - (if type - (mime-play-entity - entity - (put-alist 'type type - (put-alist 'subtype subtype - (del-alist 'method - (copy-alist situation)))) - 'mime-detect-content) - )) - ) + (setq situation (del-alist 'method (copy-alist situation))) + (mime-play-entity entity + (if type + (put-alist 'type type + (put-alist 'subtype subtype + situation)) + situation) + 'mime-detect-content))) ;;; @ mail/news message @@ -518,10 +529,11 @@ SUBTYPE is symbol to indicate subtype of media-type.") (defun mime-preview-quitting-method-for-mime-show-message-mode () "Quitting method for mime-view. It is registered to variable `mime-preview-quitting-method-alist'." - (let ((mother mime-mother-buffer) - (win-conf mime-preview-original-window-configuration) - ) - (kill-buffer mime-raw-buffer) + (let ((raw-buffer (mime-entity-buffer + (get-text-property (point-min) 'mime-view-entity))) + (mother mime-mother-buffer) + (win-conf mime-preview-original-window-configuration)) + (kill-buffer raw-buffer) (mime-preview-kill-buffer) (set-window-configuration win-conf) (pop-to-buffer mother) @@ -531,15 +543,18 @@ It is registered to variable `mime-preview-quitting-method-alist'." (let* ((new-name (format "%s-%s" (buffer-name) (mime-entity-number entity))) (mother (current-buffer)) - (children (car (mime-entity-children entity)))) - (set-buffer (get-buffer-create new-name)) - (erase-buffer) - (mime-insert-entity children) - (setq mime-message-structure children) - (setq major-mode 'mime-show-message-mode) - (mime-view-buffer (current-buffer) nil mother - nil (if (mime-entity-cooked-p entity) 'cooked)) - )) + (children (car (mime-entity-children entity))) + (preview-buffer + (mime-display-message + children new-name mother nil + (cdr (assq 'major-mode + (get-text-property (point) 'mime-view-situation)))))) + (or (get-buffer-window preview-buffer) + (let ((m-win (get-buffer-window mother))) + (if m-win + (set-window-buffer m-win preview-buffer) + (switch-to-buffer preview-buffer) + ))))) ;;; @ message/partial @@ -553,33 +568,28 @@ It is registered to variable `mime-preview-quitting-method-alist'." (number (cdr (assoc "number" cal))) (total (cdr (assoc "total" cal))) file - (mother (current-buffer)) - ) + (mother (current-buffer))) (or (file-exists-p root-dir) - (make-directory root-dir) - ) + (make-directory root-dir)) (setq id (replace-as-filename id)) (setq root-dir (concat root-dir "/" id)) (or (file-exists-p root-dir) - (make-directory root-dir) - ) + (make-directory root-dir)) (setq file (concat root-dir "/FULL")) (if (file-exists-p file) (let ((full-buf (get-buffer-create "FULL")) (pwin (or (get-buffer-window mother) (get-largest-window))) - ) + pbuf) (save-window-excursion (set-buffer full-buf) (erase-buffer) (as-binary-input-file (insert-file-contents file)) (setq major-mode 'mime-show-message-mode) (mime-view-buffer (current-buffer) nil mother) + (setq pbuf (current-buffer)) ) - (set-window-buffer pwin - (save-excursion - (set-buffer full-buf) - mime-preview-buffer)) + (set-window-buffer pwin pbuf) (select-window pwin) ) (setq file (concat root-dir "/" number)) @@ -611,7 +621,9 @@ It is registered to variable `mime-preview-quitting-method-alist'." (kill-buffer (current-buffer)) ))) ))) - (if (and total (> total 0)) + (if (and total (> total 0) + (>= (length (directory-files root-dir nil "^[0-9]+$" t)) + total)) (catch 'tag (save-excursion (set-buffer (get-buffer-create mime-temp-buffer-name)) @@ -642,15 +654,11 @@ It is registered to variable `mime-preview-quitting-method-alist'." (and (file-exists-p file) (delete-file file) )) - (save-window-excursion - (setq major-mode 'mime-show-message-mode) - (mime-view-buffer (current-buffer) nil mother) - ) (let ((pwin (or (get-buffer-window mother) (get-largest-window))) - (pbuf (save-excursion - (set-buffer full-buf) - mime-preview-buffer))) + (pbuf (mime-display-message + (mime-open-entity 'buffer (current-buffer)) + nil mother nil 'mime-show-message-mode))) (set-window-buffer pwin pbuf) (select-window pwin) )))))