X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-edit.el;h=a7df61fd4e4a755ebdba9ad895826aa85d759c9a;hb=5ccf8fa7aed59beb35664601abed9aae00e915fc;hp=02d7cd9c9702b59dd8e1510e833634c23d5f6f36;hpb=e5f31a8700bf32fdf83d9dab580ed2b9e2be03f1;p=elisp%2Fsemi.git diff --git a/mime-edit.el b/mime-edit.el index 02d7cd9..a7df61f 100644 --- a/mime-edit.el +++ b/mime-edit.el @@ -7,7 +7,7 @@ ;; Maintainer: MORIOKA Tomohiko ;; Created: 1994/08/21 renamed from mime.el ;; Renamed: 1997/2/21 from tm-edit.el -;; Version: $Revision: 0.70 $ +;; Version: $Revision: 0.96 $ ;; Keywords: MIME, multimedia, multilingual, mail, news ;; This file is part of SEMI (SEMI is Emacs MIME Interfaces). @@ -122,44 +122,65 @@ ;;; (defconst mime-edit-RCS-ID - "$Id: mime-edit.el,v 0.70 1997-03-07 14:06:53 morioka Exp $") + "$Id: mime-edit.el,v 0.96 1997-11-08 02:26:59 morioka Exp $") -(defconst mime-edit-version (get-version-string mime-edit-RCS-ID)) +(defconst mime-edit-version `,(get-version-string mime-edit-RCS-ID)) (defconst mime-edit-version-name - (concat "SEMI MIME-Edit " mime-edit-version)) + `,(concat "SEMI MIME-Edit " mime-edit-version + " - \"" semi-version-name "\"")) ;;; @ variables ;;; -(defvar mime-ignore-preceding-spaces nil - "*Ignore preceding white spaces if non-nil.") +(defgroup mime-edit nil + "MIME edit mode" + :group 'mime) -(defvar mime-ignore-trailing-spaces nil - "*Ignore trailing white spaces if non-nil.") +(defcustom mime-ignore-preceding-spaces nil + "*Ignore preceding white spaces if non-nil." + :group 'mime-edit + :type 'boolean) -(defvar mime-ignore-same-text-tag t +(defcustom mime-ignore-trailing-spaces nil + "*Ignore trailing white spaces if non-nil." + :group 'mime-edit + :type 'boolean) + +(defcustom mime-ignore-same-text-tag t "*Ignore preceding text content-type tag that is same with new one. -If non-nil, the text tag is not inserted unless something different.") +If non-nil, the text tag is not inserted unless something different." + :group 'mime-edit + :type 'boolean) -(defvar mime-auto-hide-body t - "*Hide non-textual body encoded in base64 after insertion if non-nil.") +(defcustom mime-auto-hide-body t + "*Hide non-textual body encoded in base64 after insertion if non-nil." + :group 'mime-edit + :type 'boolean) -(defvar mime-edit-voice-recorder +(defcustom mime-edit-voice-recorder (function mime-edit-voice-recorder-for-sun) - "*Function to record a voice message and encode it. [mime-edit.el]") + "*Function to record a voice message and encode it." + :group 'mime-edit + :type 'function) -(defvar mime-edit-mode-hook nil - "*Hook called when enter MIME mode.") +(defcustom mime-edit-mode-hook nil + "*Hook called when enter MIME mode." + :group 'mime-edit + :type 'hook) -(defvar mime-edit-translate-hook nil +(defcustom mime-edit-translate-hook nil "*Hook called before translating into a MIME compliant message. To insert a signature file automatically, call the function -`mime-edit-insert-signature' from this hook.") +`mime-edit-insert-signature' from this hook." + :group 'mime-edit + :type 'hook) -(defvar mime-edit-exit-hook nil - "*Hook called when exit MIME mode.") +(defcustom mime-edit-exit-hook nil + "*Hook called when exit MIME mode." + :group 'mime-edit + :type 'hook) (defvar mime-content-types '(("text" @@ -180,7 +201,7 @@ To insert a signature file automatically, call the function ("html" ;;("charset" "" "ISO-2022-JP" "US-ASCII" "ISO-8859-1" "ISO-8859-8") ) - ("x-rot13-47") + ("x-rot13-47-48") ) ("message" ("external-body" @@ -209,6 +230,7 @@ To insert a signature file automatically, call the function ("image" ("gif") ("jpeg") + ("png") ("tiff") ("x-pic") ("x-mag") @@ -244,6 +266,11 @@ To insert a signature file automatically, call the function "base64" "inline" (("filename" . file)) ) + ("\\.png$" + "image" "png" nil + "base64" + "inline" (("filename" . file)) + ) ("\\.tiff$" "image" "tiff" nil "base64" @@ -417,7 +444,7 @@ If encoding is nil, it is determined from its contents.") "Xref" "X-UIDL" "X-Filter" "X-Gnus-.*" "X-VM-.*") "Delete these fields from original message when it is inserted as message/rfc822 part. -Each elements are regexp of field-name. [mime-edit.el]") +Each elements are regexp of field-name.") (defvar mime-edit-yank-ignored-field-regexp (concat "^" @@ -431,17 +458,23 @@ Each elements are regexp of field-name. [mime-edit.el]") ;;; @@ about message splitting ;;; -(defvar mime-edit-split-message t - "*Split large message if it is non-nil. [mime-edit.el]") +(defcustom mime-edit-split-message t + "*Split large message if it is non-nil." + :group 'mime-edit + :type 'boolean) -(defvar mime-edit-message-default-max-lines 1000 - "*Default maximum lines of a message. [mime-edit.el]") +(defcustom mime-edit-message-default-max-lines 1000 + "*Default maximum lines of a message." + :group 'mime-edit + :type 'integer) -(defvar mime-edit-message-max-lines-alist +(defcustom mime-edit-message-max-lines-alist '((news-reply-mode . 500)) "Alist of major-mode vs maximum lines of a message. If it is not specified for a major-mode, -`mime-edit-message-default-max-lines' is used. [mime-edit.el]") +`mime-edit-message-default-max-lines' is used." + :group 'mime-edit + :type 'list) (defconst mime-edit-split-ignored-field-regexp "\\(^Content-\\|^Subject:\\|^Mime-Version:\\)") @@ -458,10 +491,10 @@ If it is not specified for a major-mode, ;;; (defvar mime-edit-signing-type 'pgp-elkins - "*PGP signing type (pgp-elkins, pgp-kazu or nil). [mime-edit.el]") + "*PGP signing type (pgp-elkins, pgp-kazu or nil).") (defvar mime-edit-encrypting-type 'pgp-elkins - "*PGP encrypting type (pgp-elkins, pgp-kazu or nil). [mime-edit.el]") + "*PGP encrypting type (pgp-elkins, pgp-kazu or nil).") ;;; @@ about tag @@ -512,17 +545,25 @@ If it is not specified for a major-mode, "*If non-nil, insert X-Emacs header field.") (defvar mime-edit-x-emacs-value - (if running-xemacs - (concat emacs-version - (if (featurep 'mule) - " with mule" - " without mule")) + (if (featurep 'xemacs) + (concat emacs-version (if (featurep 'mule) + " with mule" + " without mule")) (let ((ver (if (string-match "\\.[0-9]+$" emacs-version) (substring emacs-version 0 (match-beginning 0)) emacs-version))) (if (featurep 'mule) - (concat "Emacs " ver ", MULE " mule-version) - ver)))) + (concat "Emacs " ver + (if enable-multibyte-characters + (concat ", MULE " mule-version) + " (with raw setting)") + (if (featurep 'meadow) + (concat ", " (Meadow-version)) + )) + ver))) + "Body of X-Emacs field. +If variable `mime-edit-insert-x-emacs-field' is not nil, it is +inserted into message header.") ;;; @ constants @@ -536,6 +577,10 @@ Tspecials means any character that matches with it in header must be quoted.") (concat "1.0 (generated by " mime-edit-version-name ")") "MIME version number.") +(defconst mime-edit-mime-version-field-for-message/partial + (concat "MIME-Version: 1.0 (split by " mime-edit-version-name ")\n") + "MIME version field for message/partial.") + ;;; @ keymap and menu ;;; @@ -543,37 +588,65 @@ Tspecials means any character that matches with it in header must be quoted.") (defvar mime-edit-mode-flag nil) (make-variable-buffer-local 'mime-edit-mode-flag) -(defvar mime-edit-prefix "\C-c\C-x" - "*Keymap prefix for MIME-Edit commands.") - -(defvar mime-edit-map (make-sparse-keymap) - "Keymap for MIME commands.") - -(define-key mime-edit-map "\C-t" 'mime-edit-insert-text) -(define-key mime-edit-map "\C-i" 'mime-edit-insert-file) -(define-key mime-edit-map "\C-e" 'mime-edit-insert-external) -(define-key mime-edit-map "\C-v" 'mime-edit-insert-voice) -(define-key mime-edit-map "\C-y" 'mime-edit-insert-message) -(define-key mime-edit-map "\C-m" 'mime-edit-insert-mail) -(define-key mime-edit-map "\C-w" 'mime-edit-insert-signature) -(define-key mime-edit-map "\C-s" 'mime-edit-insert-signature) -(define-key mime-edit-map "\C-k" 'mime-edit-insert-key) -(define-key mime-edit-map "t" 'mime-edit-insert-tag) -(define-key mime-edit-map "a" 'mime-edit-enclose-alternative-region) -(define-key mime-edit-map "p" 'mime-edit-enclose-parallel-region) -(define-key mime-edit-map "m" 'mime-edit-enclose-mixed-region) -(define-key mime-edit-map "d" 'mime-edit-enclose-digest-region) -(define-key mime-edit-map "s" 'mime-edit-enclose-signed-region) -(define-key mime-edit-map "e" 'mime-edit-enclose-encrypted-region) -(define-key mime-edit-map "q" 'mime-edit-enclose-quote-region) -(define-key mime-edit-map "7" 'mime-edit-set-transfer-level-7bit) -(define-key mime-edit-map "8" 'mime-edit-set-transfer-level-8bit) -(define-key mime-edit-map "/" 'mime-edit-set-split) -(define-key mime-edit-map "v" 'mime-edit-set-sign) -(define-key mime-edit-map "h" 'mime-edit-set-encrypt) -(define-key mime-edit-map "\C-p" 'mime-edit-preview-message) -(define-key mime-edit-map "\C-z" 'mime-edit-exit) -(define-key mime-edit-map "?" 'mime-edit-help) +(defvar mime-edit-mode-map (make-sparse-keymap) + "Keymap for MIME-Edit mode commands.") + +(define-key mime-edit-mode-map + "\C-c\C-x\C-t" 'mime-edit-insert-text) +(define-key mime-edit-mode-map + "\C-c\C-x\C-i" 'mime-edit-insert-file) +(define-key mime-edit-mode-map + "\C-c\C-x\C-e" 'mime-edit-insert-external) +(define-key mime-edit-mode-map + "\C-c\C-x\C-v" 'mime-edit-insert-voice) +(define-key mime-edit-mode-map + "\C-c\C-x\C-y" 'mime-edit-insert-message) +(define-key mime-edit-mode-map + "\C-c\C-x\C-m" 'mime-edit-insert-mail) +(define-key mime-edit-mode-map + "\C-c\C-x\C-w" 'mime-edit-insert-signature) +(define-key mime-edit-mode-map + "\C-c\C-x\C-s" 'mime-edit-insert-signature) +(define-key mime-edit-mode-map + "\C-c\C-x\C-k" 'mime-edit-insert-key) +(define-key mime-edit-mode-map + "\C-c\C-xt" 'mime-edit-insert-tag) + +(define-key mime-edit-mode-map + "\C-c\C-m\C-a" 'mime-edit-enclose-alternative-region) +(define-key mime-edit-mode-map + "\C-c\C-m\C-p" 'mime-edit-enclose-parallel-region) +(define-key mime-edit-mode-map + "\C-c\C-m\C-m" 'mime-edit-enclose-mixed-region) +(define-key mime-edit-mode-map + "\C-c\C-m\C-d" 'mime-edit-enclose-digest-region) +(define-key mime-edit-mode-map + "\C-c\C-m\C-s" 'mime-edit-enclose-signed-region) +(define-key mime-edit-mode-map + "\C-c\C-m\C-e" 'mime-edit-enclose-encrypted-region) +(define-key mime-edit-mode-map + "\C-c\C-m\C-q" 'mime-edit-enclose-quote-region) + +(define-key mime-edit-mode-map + "\C-c\C-x7" 'mime-edit-set-transfer-level-7bit) +(define-key mime-edit-mode-map + "\C-c\C-x8" 'mime-edit-set-transfer-level-8bit) +(define-key mime-edit-mode-map + "\C-c\C-x/" 'mime-edit-set-split) +(define-key mime-edit-mode-map + "\C-c\C-xs" 'mime-edit-set-sign) +(define-key mime-edit-mode-map + "\C-c\C-xv" 'mime-edit-set-sign) +(define-key mime-edit-mode-map + "\C-c\C-xe" 'mime-edit-set-encrypt) +(define-key mime-edit-mode-map + "\C-c\C-xh" 'mime-edit-set-encrypt) +(define-key mime-edit-mode-map + "\C-c\C-x\C-p" 'mime-edit-preview-message) +(define-key mime-edit-mode-map + "\C-c\C-x\C-z" 'mime-edit-exit) +(define-key mime-edit-mode-map + "\C-c\C-x?" 'mime-edit-help) (defconst mime-edit-menu-title "MIME-Edit") @@ -604,10 +677,6 @@ Tspecials means any character that matches with it in header must be quoted.") ) "MIME-edit menubar entry.") -(defvar mime-edit-mode-map (make-sparse-keymap) - "Keymap for MIME-Edit mode commands.") -(define-key mime-edit-mode-map mime-edit-prefix mime-edit-map) - (cond (running-xemacs ;; modified by Pekka Marjola ;; 1995/9/5 (c.f. [tm-en:69]) @@ -654,22 +723,6 @@ Tspecials means any character that matches with it in header must be quoted.") ) )) -(cond (running-xemacs - (add-minor-mode 'mime-edit-mode-flag - '((" MIME-Edit " mime-transfer-level-string)) - mime-edit-mode-map - nil - 'mime-edit-mode) - ) - (t - (set-alist 'minor-mode-alist - 'mime-edit-mode-flag - '((" MIME-Edit " mime-transfer-level-string))) - (set-alist 'minor-mode-map-alist - 'mime-edit-mode-flag - mime-edit-mode-map) - )) - ;;; @ functions ;;; @@ -817,6 +870,24 @@ User customizable variables (not documented all of them): (turn-on-mime-edit) ))) + +(cond (running-xemacs + (add-minor-mode 'mime-edit-mode-flag + '((" MIME-Edit " mime-transfer-level-string)) + mime-edit-mode-map + nil + 'mime-edit-mode) + ) + (t + (set-alist 'minor-mode-alist + 'mime-edit-mode-flag + '((" MIME-Edit " mime-transfer-level-string))) + (set-alist 'minor-mode-map-alist + 'mime-edit-mode-flag + mime-edit-mode-map) + )) + + ;;;###autoload (defun turn-on-mime-edit () "Unconditionally turn on MIME-Edit mode." @@ -854,6 +925,7 @@ User customizable variables (not documented all of them): ;;;###autoload (defalias 'edit-mime 'turn-on-mime-edit) ; for convenience + (defun mime-edit-exit (&optional nomime no-error) "Translate the tagged MIME message into a MIME compliant message. With no argument encode a message in the buffer into MIME, otherwise @@ -906,7 +978,7 @@ Charset is automatically obtained from the `charsets-mime-charset-alist'." (insert "\n") (forward-char -1) )) - (if (and (member (second ret) '("enriched" "richtext")) + (if (and (member (cadr ret) '("enriched" "richtext")) (fboundp 'enriched-mode) ) (enriched-mode t) @@ -1121,7 +1193,7 @@ Optional argument ENCODING specifies an encoding method such as base64." (defun mime-edit-goto-tag () "Search for the beginning of the tagged MIME message." - (let ((current (point)) multipart) + (let ((current (point))) (if (looking-at mime-edit-tag-regexp) t ;; At first, go to the end. @@ -1166,26 +1238,25 @@ Optional argument ENCODING specifies an encoding method such as base64." (defun mime-edit-content-end () "Return the point of the end of content." (save-excursion - (let ((beg (point))) - (if (mime-edit-goto-tag) - (let ((top (point))) - (goto-char (match-end 0)) - (if (invisible-p (point)) - (next-visible-point (point)) - ;; Move to the end of this text. - (if (re-search-forward mime-edit-tag-regexp nil 'move) - ;; Don't forget a multiline tag. - (goto-char (match-beginning 0)) - ) - (point) - )) - ;; Assume the message begins with text/plain. - (goto-char (mime-edit-content-beginning)) - (if (re-search-forward mime-edit-tag-regexp nil 'move) - ;; Don't forget a multiline tag. - (goto-char (match-beginning 0))) - (point)) - ))) + (if (mime-edit-goto-tag) + (progn + (goto-char (match-end 0)) + (if (invisible-p (point)) + (next-visible-point (point)) + ;; Move to the end of this text. + (if (re-search-forward mime-edit-tag-regexp nil 'move) + ;; Don't forget a multiline tag. + (goto-char (match-beginning 0)) + ) + (point) + )) + ;; Assume the message begins with text/plain. + (goto-char (mime-edit-content-beginning)) + (if (re-search-forward mime-edit-tag-regexp nil 'move) + ;; Don't forget a multiline tag. + (goto-char (match-beginning 0))) + (point)) + )) (defun mime-edit-define-charset (charset) "Set charset of current tag to CHARSET." @@ -1417,7 +1488,7 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))." )) (defun mime-prompt-for-encoding (default) - "Ask for Content-Transfer-Encoding. [mime-edit.el]" + "Ask for Content-Transfer-Encoding." (let (encoding) (while (string= (setq encoding @@ -1573,8 +1644,9 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))." (insert (format "Content-Transfer-Encoding: %s\n" encoding)) ) (insert "\n") - (or (funcall (pgp-function 'mime-sign) - (point-min)(point-max) nil nil pgp-boundary) + (or (as-binary-process + (funcall (pgp-function 'mime-sign) + (point-min)(point-max) nil nil pgp-boundary)) (throw 'mime-edit-error 'pgp-error) ) )))) @@ -1775,7 +1847,7 @@ Content-Transfer-Encoding: 7bit (insert mime-edit-x-emacs-value) )) ;; Make primary MIME headers. - (or (mail-position-on-field "Mime-Version") + (or (mail-position-on-field "MIME-Version") (insert mime-edit-mime-version-value)) ;; Remove old Content-Type and other fields. (save-restriction @@ -1795,22 +1867,24 @@ Content-Transfer-Encoding: 7bit )))) (defun mime-edit-translate-single-part-tag (&optional prefix) + "Translate single-part-tag to MIME header." (if (re-search-forward mime-edit-single-part-tag-regexp nil t) (let* ((beg (match-beginning 0)) (end (match-end 0)) (tag (buffer-substring beg end)) ) (delete-region beg end) - (setq contype (mime-edit-get-contype tag)) - (setq encoding (mime-edit-get-encoding tag)) - (insert (concat prefix "--" boundary "\n")) - (save-restriction - (narrow-to-region (point)(point)) - (insert "Content-Type: " contype "\n") - (if encoding - (insert "Content-Transfer-Encoding: " encoding "\n")) - (eword-encode-header) - ) + (let ((contype (mime-edit-get-contype tag)) + (encoding (mime-edit-get-encoding tag)) + ) + (insert (concat prefix "--" boundary "\n")) + (save-restriction + (narrow-to-region (point)(point)) + (insert "Content-Type: " contype "\n") + (if encoding + (insert "Content-Transfer-Encoding: " encoding "\n")) + (eword-encode-header) + )) t))) (defun mime-edit-translate-region (beg end &optional boundary multipart) @@ -1905,12 +1979,10 @@ Content-Transfer-Encoding: 7bit (intern (downcase charset)) (mime-edit-choose-charset))) (mime-edit-define-charset charset) - (cond ((string-equal contype "text/x-rot13-47") + (cond ((string-equal contype "text/x-rot13-47-48") (save-excursion (forward-line) - (set-mark (point)) - (goto-char (mime-edit-content-end)) - (tm:caesar-region) + (mule-caesar-region (point) (mime-edit-content-end)) )) ((string-equal contype "text/enriched") (save-excursion @@ -1945,6 +2017,33 @@ Content-Transfer-Encoding: 7bit ) (encode-mime-charset-region beg (mime-edit-content-end) charset) + ;; Protect "From " in beginning of line + (save-restriction + (narrow-to-region beg (mime-edit-content-end)) + (goto-char beg) + (if (re-search-forward "^From " nil t) + (unless encoding + (if (memq charset '(iso-2022-jp + iso-2022-jp-2 + iso-2022-int-1 + x-ctext)) + (while (progn + (replace-match "\e(BFrom ") + (re-search-forward "^From " nil t) + )) + (setq encoding "quoted-printable") + )))) + ;; canonicalize line break code + (or (member encoding '(nil "7bit" "8bit" "quoted-printable")) + (save-restriction + (narrow-to-region beg (mime-edit-content-end)) + (goto-char beg) + (while (re-search-forward "\\([^\r]\\)\n" nil t) + (replace-match + (concat (buffer-substring (match-beginning 0) + (match-end 1)) "\r\n")) + ))) + (goto-char beg) (mime-encode-region beg (mime-edit-content-end) encoding) (mime-edit-define-encoding encoding) )) @@ -1983,7 +2082,7 @@ Content-Transfer-Encoding: 7bit (defun mime-edit-voice-recorder-for-sun (encoding) "Record voice in a buffer using Sun audio device, -and insert data encoded as ENCODING. [mime-edit.el]" +and insert data encoded as ENCODING." (message "Start the recording on %s. Type C-g to finish the recording..." (system-name)) (mime-insert-encoded-file "/dev/audio" encoding) @@ -2061,40 +2160,40 @@ and insert data encoded as ENCODING. [mime-edit.el]" (defun mime-edit-enclose-quote-region (beg end) (interactive "*r") - (mime-edit-enclose-region "quote" beg end) + (mime-edit-enclose-region 'quote beg end) ) (defun mime-edit-enclose-mixed-region (beg end) (interactive "*r") - (mime-edit-enclose-region "mixed" beg end) + (mime-edit-enclose-region 'mixed beg end) ) (defun mime-edit-enclose-parallel-region (beg end) (interactive "*r") - (mime-edit-enclose-region "parallel" beg end) + (mime-edit-enclose-region 'parallel beg end) ) (defun mime-edit-enclose-digest-region (beg end) (interactive "*r") - (mime-edit-enclose-region "digest" beg end) + (mime-edit-enclose-region 'digest beg end) ) (defun mime-edit-enclose-alternative-region (beg end) (interactive "*r") - (mime-edit-enclose-region "alternative" beg end) + (mime-edit-enclose-region 'alternative beg end) ) (defun mime-edit-enclose-signed-region (beg end) (interactive "*r") (if mime-edit-signing-type - (mime-edit-enclose-region "signed" beg end) + (mime-edit-enclose-region 'signed beg end) (message "Please specify signing type.") )) (defun mime-edit-enclose-encrypted-region (beg end) (interactive "*r") (if mime-edit-signing-type - (mime-edit-enclose-region "encrypted" beg end) + (mime-edit-enclose-region 'encrypted beg end) (message "Please specify encrypting type.") )) @@ -2217,12 +2316,11 @@ Optional TRANSFER-LEVEL is a number of transfer-level, 7 or 8." ;;; @ split ;;; -(defun mime-edit-insert-partial-header - (fields subject id number total separator) +(defun mime-edit-insert-partial-header (fields subject + id number total separator) (insert fields) (insert (format "Subject: %s (%d/%d)\n" subject number total)) - (insert (format "Mime-Version: 1.0 (split by %s)\n" - mime-edit-version-name)) + (insert mime-edit-mime-version-field-for-message/partial) (insert (format "\ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n" id number total separator)) @@ -2348,7 +2446,7 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n" (defvar mime-edit-buffer nil) ; buffer local variable (defun mime-edit-preview-message () - "preview editing MIME message. [mime-edit.el]" + "preview editing MIME message." (interactive) (let* ((str (buffer-string)) (separator mail-header-separator) @@ -2383,7 +2481,8 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n" )) (defun mime-edit-quitting-method () - (let ((temp mime::preview/article-buffer) + "Quitting method for mime-view." + (let ((temp mime-raw-buffer) buf) (mime-view-kill-buffer) (set-buffer temp) @@ -2410,23 +2509,17 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n" (defun mime-edit-decode-buffer (not-decode-text) (save-excursion (goto-char (point-min)) - (let ((ctl (mime/Content-Type))) + (let ((ctl (mime-read-Content-Type))) (if ctl - (let ((ctype (car ctl)) - (params (cdr ctl)) - type stype) - (if (string-match "/" ctype) - (progn - (setq type (substring ctype 0 (match-beginning 0))) - (setq stype (substring ctype (match-end 0))) - ) - (setq type ctype) - ) + (let ((type (car ctl)) + (stype (car (cdr ctl))) + (params (cdr (cdr ctl))) + ) (cond - ((string= ctype "application/pgp-signature") + ((and (eq type 'application)(eq stype 'pgp-signature)) (delete-region (point-min)(point-max)) ) - ((string= type "multipart") + ((eq type 'multipart) (let* ((boundary (cdr (assoc "boundary" params))) (boundary-pat (concat "\n--" (regexp-quote boundary) "[ \t]*\n")) @@ -2469,12 +2562,13 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n" ))) )) (t - (let* (charset + (let* ((ctype (format "%s/%s" type stype)) + charset (pstr (let ((bytes (+ 14 (length ctype)))) (mapconcat (function (lambda (attr) - (if (string-equal (car attr) "charset") + (if (string= (car attr) "charset") (progn (setq charset (cdr attr)) "") @@ -2504,7 +2598,7 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n" (eliminate-top-spaces (std11-unfold-string (buffer-substring hbeg end)))) - (if (or charset (string-equal type "text")) + (if (or charset (eq type 'text)) (progn (delete-region beg (1+ end)) (goto-char (point-min)) @@ -2531,12 +2625,14 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n" (insert (concat "\n" (mime-create-tag - (concat type "/" stype pstr) encoding))) + (format "%s/%s%s" type stype pstr) + encoding))) ) (delete-region (point-min) he) (insert (mime-create-tag - (concat type "/" stype pstr) encoding)) + (format "%s/%s%s" type stype pstr) + encoding)) )) )))) (or not-decode-text