warn t))
(setq point (point)
contents (mml-read-part)
- charsets (delq 'ascii (mm-find-charset-region point (point))))
+ charsets (mm-find-mime-charset-region point (point)))
(if (< (length charsets) 2)
(push (nconc tag (list (cons 'contents contents)))
struct)
(save-excursion
(narrow-to-region beg end)
(goto-char (point-min))
- (let ((current (char-charset (following-char)))
+ (let ((current (mm-mime-charset (char-charset (following-char))))
charset struct space newline paragraph)
(while (not (eobp))
(cond
;; The charset remains the same.
- ((or (eq (setq charset (char-charset (following-char))) 'ascii)
+ ((or (eq (setq charset (mm-mime-charset
+ (char-charset (following-char)))) 'us-ascii)
(eq charset current)))
;; The initial charset was ascii.
- ((eq current 'ascii)
+ ((eq current 'us-ascii)
(setq current charset
space nil
newline nil
(push (cons (intern elem) val) contents)
(skip-chars-forward " \t\n"))
(forward-char 1)
+ (skip-chars-forward " \t\n")
(cons (intern name) (nreverse contents))))
(defun mml-read-part ()
(setq type (or (cdr (assq 'type cont)) "text/plain"))
(if (equal (car (split-string type "/")) "text")
(with-temp-buffer
- (if (setq filename (cdr (assq 'filename cont)))
- (insert-file-contents-literally filename)
+ (cond
+ ((cdr (assq 'buffer cont))
+ (insert-buffer-substring (cdr (assq 'buffer cont))))
+ ((setq filename (cdr (assq 'filename cont)))
+ (insert-file-contents-literally filename))
+ (t
(save-restriction
(narrow-to-region (point) (point))
(insert (cdr (assq 'contents cont)))
(while (re-search-forward
"<#!+/?\\(part\\|multipart\\|external\\)" nil t)
(delete-region (+ (match-beginning 0) 2)
- (+ (match-beginning 0) 3)))))
- (setq charset (mm-encode-body)
- encoding (mm-body-encoding))
+ (+ (match-beginning 0) 3))))))
+ (setq charset (mm-encode-body))
+ (setq encoding (mm-body-encoding charset))
(setq coded (buffer-string)))
(mm-with-unibyte-buffer
- (if (setq filename (cdr (assq 'filename cont)))
- (insert-file-contents-literally filename)
- (insert (cdr (assq 'contents cont))))
+ (cond
+ ((cdr (assq 'buffer cont))
+ (insert-buffer-substring (cdr (assq 'buffer cont))))
+ ((setq filename (cdr (assq 'filename cont)))
+ (insert-file-contents-literally filename))
+ (t
+ (insert (cdr (assq 'contents cont)))))
(setq encoding (mm-encode-buffer type)
coded (buffer-string))))
(mml-insert-mime-headers cont type charset encoding)
(cond
((eq (car cont) 'part)
(with-temp-buffer
- (if (setq filename (cdr (assq 'filename cont)))
- (insert-file-contents-literally filename)
- (insert (cdr (assq 'contents cont))))
+ (cond
+ ((cdr (assq 'buffer cont))
+ (insert-buffer-substring (cdr (assq 'buffer cont))))
+ ((setq filename (cdr (assq 'filename cont)))
+ (insert-file-contents-literally filename))
+ (t
+ (insert (cdr (assq 'contents cont)))))
(goto-char (point-min))
(when (re-search-forward (concat "^--" (regexp-quote mml-boundary))
nil t)
(substring path (1+ (match-end 2))))
path))
+(defun mml-insert-buffer (buffer)
+ "Insert BUFFER at point and quote any MML markup."
+ (save-restriction
+ (narrow-to-region (point) (point))
+ (insert-buffer-substring buffer)
+ (mml-quote-region (point-min) (point-max))
+ (goto-char (point-max))))
+
+;;;
+;;; Transforming MIME to MML
+;;;
+
+(defun mime-to-mml ()
+ "Translate the current buffer (which should be a message) into MML."
+ ;; First decode the head.
+ (save-restriction
+ (message-narrow-to-head)
+ (mail-decode-encoded-word-region (point-min) (point-max)))
+ (let ((handles (mm-dissect-buffer t)))
+ (goto-char (point-min))
+ (search-forward "\n\n" nil t)
+ (delete-region (point) (point-max))
+ (if (stringp (car handles))
+ (mml-insert-mime handles)
+ (mml-insert-mime handles t))
+ (mm-destroy-parts handles)))
+
+(defun mml-to-mime ()
+ "Translate the current buffer from MML to MIME."
+ (message-encode-message-body)
+ (save-restriction
+ (message-narrow-to-headers)
+ (mail-encode-encoded-word-buffer)))
+
+(defun mml-insert-mime (handle &optional no-markup)
+ (let (textp buffer)
+ ;; Determine type and stuff.
+ (unless (stringp (car handle))
+ (unless (setq textp (equal
+ (car (split-string
+ (car (mm-handle-type handle)) "/"))
+ "text"))
+ (save-excursion
+ (set-buffer (setq buffer (generate-new-buffer " *mml*")))
+ (mm-insert-part handle))))
+ (unless no-markup
+ (mml-insert-mml-markup handle buffer))
+ (cond
+ ((stringp (car handle))
+ (mapcar 'mml-insert-mime (cdr handle))
+ (insert "<#/multipart>\n"))
+ (textp
+ (mm-insert-part handle)
+ (goto-char (point-max)))
+ (t
+ (insert "<#/part>\n")))))
+
+(defun mml-insert-mml-markup (handle &optional buffer)
+ "Take a MIME handle and insert an MML tag."
+ (if (stringp (car handle))
+ (insert "<#multipart type=" (cadr (split-string (car handle) "/"))
+ ">\n")
+ (insert "<#part type=" (car (mm-handle-type handle)))
+ (dolist (elem (append (cdr (mm-handle-type handle))
+ (cdr (mm-handle-disposition handle))))
+ (insert " " (symbol-name (car elem)) "=\"" (cdr elem) "\""))
+ (when buffer
+ (insert " buffer=\"" (buffer-name buffer) "\""))
+ (when (mm-handle-description handle)
+ (insert " description=\"" (mm-handle-description handle) "\""))
+ (equal (split-string (car (mm-handle-type handle)) "/") "text")
+ (insert ">\n")))
+
+;;;
+;;; Mode for inserting and editing MML forms
+;;;
+
+(defvar mml-mode-map
+ (let ((map (make-sparse-keymap))
+ (main (make-sparse-keymap)))
+ (define-key map "f" 'mml-attach-file)
+ (define-key map "b" 'mml-attach-buffer)
+ (define-key map "q" 'mml-quote-region)
+ (define-key map "m" 'mml-insert-multipart)
+ (define-key map "q" 'mml-insert-part)
+ (define-key map "v" 'mml-validate)
+ (define-key main "\M-m" map)
+ main))
+
+(easy-menu-define
+ mml-menu mml-mode-map ""
+ '("MML"
+ ("Attach"
+ ["File" mml-attach-file t]
+ ["Buffer" mml-attach-buffer t])
+ ("Insert"
+ ["Multipart" mml-insert-multipart t]
+ ["Part" mml-insert-part t])
+ ["Quote" mml-quote-region t]
+ ["Validate" mml-validate t]))
+
+(defvar mml-mode nil
+ "Minor mode for editing MML.")
+
+(defun mml-mode (&optional arg)
+ "Minor mode for editing MML.
+
+\\{mml-mode-map}"
+ (interactive "P")
+ (if (not (set (make-local-variable 'mml-mode)
+ (if (null arg) (not mml-mode)
+ (> (prefix-numeric-value arg) 0))))
+ nil
+ (set (make-local-variable 'mml-mode) t)
+ (unless (assq 'mml-mode minor-mode-alist)
+ (push `(mml-mode " MML") minor-mode-alist))
+ (unless (assq 'mml-mode minor-mode-map-alist)
+ (push (cons 'mml-mode mml-mode-map)
+ minor-mode-map-alist)))
+ (run-hooks 'mml-mode-hook))
+
+(defun mml-read-file (prompt)
+ (let ((file (read-file-name prompt nil nil t)))
+ ;; Prevent some common errors. This is inspired by similar code in
+ ;; VM.
+ (when (file-directory-p file)
+ (error "%s is a directory, cannot attach" file))
+ (unless (file-exists-p file)
+ (error "No such file: %s" file))
+ (unless (file-readable-p file)
+ (error "Permission denied: %s" file))
+ file))
+
+(defun mml-read-type (file)
+ (let* ((default (or (mm-default-file-encoding file)
+ ;; Perhaps here we should check what the file
+ ;; looks like, and offer text/plain if it looks
+ ;; like text/plain.
+ "application/octet-stream"))
+ (string (completing-read
+ (format "Content type (default %s): " default)
+ (delete-duplicates
+ (mapcar (lambda (m) (list (cdr m))) mailcap-mime-extensions)
+ :test 'equal))))
+ (if (not (equal string ""))
+ string
+ default)))
+
+(defun mml-read-description ()
+ (let ((description (read-string "One line description: ")))
+ (when (string-match "\\`[ \t]*\\'" description)
+ (setq description nil))
+ description))
+
(defun mml-quote-region (beg end)
"Quote the MML tags in the region."
(interactive "r")
(goto-char (match-beginning 1))
(insert "!"))))
+(defun mml-attach-file (file &optional type description)
+ "Attach a file to the outgoing MIME message.
+The file is not inserted or encoded until you send the message with
+`\\[message-send-and-exit]' or `\\[message-send]'.
+
+FILE is the name of the file to attach. TYPE is its content-type, a
+string of the form \"type/subtype\". DESCRIPTION is a one-line
+description of the attachment."
+ (interactive
+ (let* ((file (mml-read-file "Attach file: "))
+ (type (mml-read-type file))
+ (description (mml-read-description)))
+ (list file type description)))
+ (insert
+ (format
+ "<#part type=%s name=%s filename=%s%s disposition=attachment><#/part>\n"
+ type (prin1-to-string (file-name-nondirectory file))
+ (prin1-to-string file)
+ (if description
+ (format " description=%s" (prin1-to-string description))
+ ""))))
+
+(defun mml-attach-external (file &optional type description)
+ "Attach an external file into the buffer.
+FILE is an ange-ftp/efs specification of the part location.
+TYPE is the MIME type to use."
+ (interactive
+ (let* ((file (mml-read-file "Attach external file: "))
+ (type (mml-read-type file))
+ (description (mml-read-description)))
+ (list file type description)))
+ (insert (format
+ "<#external type=%s name=%s disposition=attachment><#/external>\n"
+ type (prin1-to-string file))))
+
+
(provide 'mml)
;;; mml.el ends here
projects / elisp / gnus.git- / blobdiff