;;; Code:
;;
-
(require 'mime-view)
(require 'mime-edit)
(require 'mime-play)
(require 'elmo)
+(require 'wl-vars)
(eval-when-compile
(defalias-maybe 'pgg-decrypt-region 'ignore)
(set-buffer message-buffer)
(save-restriction
(widen)
- (if (wl-region-exists-p)
- (wl-mime-preview-follow-current-region)
- (mime-preview-follow-current-entity))))
+ (cond
+ ((wl-region-exists-p)
+ (wl-mime-preview-follow-current-region))
+ ((not (wl-message-mime-analysis-p
+ (wl-message-buffer-display-type)))
+ (wl-mime-preview-follow-no-mime
+ (wl-message-buffer-display-type)))
+ (t
+ (mime-preview-follow-current-entity)))))
(error "No message."))))
;; modified mime-preview-follow-current-entity from mime-view.el
+(defun wl-mime-preview-follow-no-mime (display-type)
+ "Write follow message to current message, without mime.
+It calls following-method selected from variable
+`mime-preview-following-method-alist'."
+ (interactive)
+ (let* ((mode (mime-preview-original-major-mode 'recursive))
+ (new-name (format "%s-no-mime" (buffer-name)))
+ new-buf min beg end
+ (entity (get-text-property (point-min) 'elmo-as-is-entity))
+ (the-buf (current-buffer))
+ fields)
+ (save-excursion
+ (goto-char (point-min))
+ (setq min (point-min)
+ beg (re-search-forward "^$" nil t)
+ end (point-max)))
+ (save-excursion
+ (set-buffer (setq new-buf (get-buffer-create new-name)))
+ (erase-buffer)
+ (insert-buffer-substring the-buf beg end)
+ (goto-char (point-min))
+ ;; Insert all headers.
+ (let ((elmo-mime-display-header-analysis
+ (wl-message-mime-analysis-p display-type 'header)))
+ (elmo-mime-insert-sorted-header entity))
+ (let ((f (cdr (assq mode mime-preview-following-method-alist))))
+ (if (functionp f)
+ (funcall f new-buf)
+ (message
+ "Sorry, following method for %s is not implemented yet."
+ mode))))))
+
+;; modified mime-preview-follow-current-entity from mime-view.el
(defun wl-mime-preview-follow-current-region ()
"Write follow message to current region.
It calls following-method selected from variable
(insert-buffer-substring the-buf r-beg r-end)
(goto-char (point-min))
(let ((current-entity
- (if (and (eq (mime-entity-media-type entity) 'message)
+ (if (and entity
+ (eq (mime-entity-media-type entity) 'message)
(eq (mime-entity-media-subtype entity) 'rfc822))
(car (mime-entity-children entity))
entity)))
(mime-insert-header current-entity fields)
t))
(setq fields (std11-collect-field-names)
- current-entity (mime-entity-parent current-entity))
- ))
+ current-entity (mime-entity-parent current-entity))))
(let ((rest mime-view-following-required-fields-list)
field-name ret)
(while rest
entity field-name))))
(setq entity (mime-entity-parent entity)))))
(if ret
- (insert (concat field-name ": " ret "\n"))
- )))
- (setq rest (cdr rest))
- ))
- )
+ (insert (concat field-name ": " ret "\n")))))
+ (setq rest (cdr rest)))))
(let ((f (cdr (assq mode mime-preview-following-method-alist))))
(if (functionp f)
(funcall f new-buf)
(message
"Sorry, following method for %s is not implemented yet."
- mode)
- ))
- )))
+ mode))))))
(defalias 'wl-draft-enclose-digest-region 'mime-edit-enclose-digest-region)
+(defun wl-draft-preview-attributes-list ()
+ (if (listp (car wl-draft-preview-attributes-list))
+ (elmo-uniq-list
+ (nconc (and (wl-message-mail-p)
+ (copy-sequence
+ (cdr (assq 'mail wl-draft-preview-attributes-list))))
+ (and (wl-message-news-p)
+ (copy-sequence
+ (cdr (assq 'news wl-draft-preview-attributes-list))))))
+ wl-draft-preview-attributes-list))
+
+(defun wl-draft-show-attributes-buffer (attribute-values)
+ (let* ((cur-win (selected-window))
+ (size (min
+ (- (window-height cur-win)
+ window-min-height 1)
+ (- (window-height cur-win)
+ (max
+ window-min-height
+ (1+ wl-draft-preview-attributes-buffer-lines))))))
+ (split-window cur-win (if (> size 0) size window-min-height))
+ (select-window (next-window))
+ (let ((pop-up-windows nil))
+ (switch-to-buffer (get-buffer-create
+ wl-draft-preview-attributes-buffer-name)))
+ (with-current-buffer
+ (get-buffer wl-draft-preview-attributes-buffer-name)
+ (setq buffer-read-only t)
+ (let (buffer-read-only)
+ (erase-buffer)
+ (dolist (pair attribute-values)
+ (insert (capitalize (symbol-name (car pair))) ": "
+ (format "%s" (or (cdr pair) ""))
+ "\n"))
+ (goto-char (point-min))
+ (wl-highlight-headers)))
+ (select-window cur-win)))
+
+(defun wl-draft-hide-attributes-buffer ()
+ (let (window buffer)
+ (when (setq window (get-buffer-window
+ wl-draft-preview-attributes-buffer-name))
+ (select-window window)
+ (delete-window))
+ (when (setq buffer (get-buffer wl-draft-preview-attributes-buffer-name))
+ (kill-buffer buffer))))
+
(defun wl-draft-attribute-recipients ()
- (concat (mapconcat
- 'identity
- (wl-draft-deduce-address-list
- (current-buffer)
- (point-min)
- (save-excursion
- (goto-char (point-min))
- (re-search-forward
- (concat
- "^"
- (regexp-quote mail-header-separator)
- "$")
- nil t)
- (point)))
- ", ")))
+ (let (wl-draft-remove-group-list-contents)
+ (mapconcat
+ 'identity
+ (nconc
+ (wl-draft-deduce-address-list
+ (current-buffer)
+ (point-min)
+ (save-excursion
+ (goto-char (point-min))
+ (re-search-forward
+ (concat
+ "^"
+ (regexp-quote mail-header-separator)
+ "$")
+ nil t)
+ (point)))
+ (wl-draft-parse-mailbox-list wl-draft-mime-bcc-field-name))
+ ", ")))
(defun wl-draft-attribute-envelope-from ()
(or wl-envelope-from
(or wl-smtp-posting-port
(progn (require 'smtp) smtp-service)))
+(defun wl-draft-attribute-newsgroups ()
+ (std11-field-body "Newsgroups"))
+
+(defun wl-draft-nntp-attribute (attribute &optional alternatives)
+ (let ((config (cdr (elmo-string-matched-assoc
+ (std11-field-body "newsgroups")
+ wl-nntp-posting-config-alist)))
+ entry)
+ (when (stringp config)
+ (setq config (list (cons 'server config))))
+ (if (setq entry (assq attribute config))
+ ;; maybe nil
+ (cdr entry)
+ (let (value)
+ (while alternatives
+ (if (setq value (symbol-value (car alternatives)))
+ (setq alternatives nil)
+ (setq alternatives (cdr alternatives))))
+ value))))
+
+(defun wl-draft-attribute-nntp-posting-server ()
+ (wl-draft-nntp-attribute
+ 'server
+ '(wl-nntp-posting-server elmo-nntp-default-server)))
+
+(defun wl-draft-attribute-nntp-posting-port ()
+ (wl-draft-nntp-attribute
+ 'port
+ '(wl-nntp-posting-port elmo-nntp-default-port)))
+
(defun wl-draft-attribute-value (attr)
(let ((name (symbol-name attr))
fsymbol symbol)
((boundp attr)
(symbol-value attr)))))
+(defun wl-mime-quit-preview ()
+ "Quitting method for mime-view."
+ (let* ((temp (and (boundp 'mime-edit-temp-message-buffer) ;; for SEMI <= 1.14.6
+ mime-edit-temp-message-buffer))
+ (window (selected-window))
+ buf)
+ (mime-preview-kill-buffer)
+ (set-buffer temp)
+ (setq buf mime-edit-buffer)
+ (kill-buffer temp)
+ (select-window window)
+ (switch-to-buffer buf)))
+
(defun wl-draft-preview-message ()
"Preview editing message."
(interactive)
- (let* (attribute-list
+ (let* (attribute-values
(orig-buffer (current-buffer))
(current-point (point))
(config-exec-flag wl-draft-config-exec-flag)
(symbol-value 'mime-header-encode-method-alist))))
mime-view-ignored-field-list ; all header.
(mime-edit-translate-buffer-hook
- (append
- (list
- (lambda ()
- (let ((wl-draft-config-exec-flag config-exec-flag)
- (wl-draft-parent-folder parent-folder)
- (copy-buffer (current-buffer)))
+ (cons
+ (lambda ()
+ (let ((wl-draft-config-exec-flag config-exec-flag)
+ (wl-draft-parent-folder parent-folder)
+ (copy-buffer (current-buffer)))
+ (wl-copy-local-variables
+ orig-buffer
+ copy-buffer
(with-current-buffer orig-buffer
- (wl-copy-local-variables
- orig-buffer
- copy-buffer
- (append wl-draft-config-variables
- (wl-draft-clone-local-variables))))
- (goto-char current-point)
- (run-hooks 'wl-draft-send-hook)
- (condition-case err
- (setq attribute-list
- (mapcar
- (lambda (attr)
- (cons attr (wl-draft-attribute-value attr)))
- wl-draft-preview-attributes-list))
- (error
- (kill-buffer (current-buffer))
- (signal (car err) (cdr err)))))))
+ (append wl-draft-config-variables
+ (wl-draft-clone-local-variables))))
+ (goto-char current-point)
+ (run-hooks 'wl-draft-send-hook)
+ (condition-case err
+ (setq attribute-values
+ (mapcar
+ (lambda (attr)
+ (cons attr (wl-draft-attribute-value attr)))
+ (if wl-draft-preview-attributes
+ (wl-draft-preview-attributes-list)
+ '(recipients))))
+ (error
+ (kill-buffer (current-buffer))
+ (signal (car err) (cdr err))))))
mime-edit-translate-buffer-hook)))
(mime-edit-preview-message)
+ (make-local-variable 'mime-preview-quitting-method-alist)
+ (setq mime-preview-quitting-method-alist
+ '((mime-temp-message-mode . wl-mime-quit-preview)))
(let ((buffer-read-only nil))
(when wl-highlight-body-too
(wl-highlight-body))
(run-hooks 'wl-draft-preview-message-hook))
- (make-local-variable 'kill-buffer-hook)
- (add-hook 'kill-buffer-hook
- (lambda ()
- (when (get-buffer-window
- wl-draft-preview-attributes-buffer-name)
- (select-window (get-buffer-window
- wl-draft-preview-attributes-buffer-name))
- (delete-window))
- (when (get-buffer wl-draft-preview-attributes-buffer-name)
- (kill-buffer (get-buffer
- wl-draft-preview-attributes-buffer-name)))))
- (if (not wl-draft-preview-attributes)
- (message (concat "Recipients: "
- (cdr (assq 'recipients attribute-list))))
- (ignore-errors ; in case when the window is too small
- (let* ((cur-win (selected-window))
- (size (min
- (- (window-height cur-win)
- window-min-height 1)
- (- (window-height cur-win)
- (max
- window-min-height
- (1+ wl-draft-preview-attributes-buffer-lines))))))
- (split-window cur-win (if (> size 0) size window-min-height))
- (select-window (next-window))
- (let ((pop-up-windows nil))
- (switch-to-buffer (get-buffer-create
- wl-draft-preview-attributes-buffer-name)))
- (with-current-buffer
- (get-buffer wl-draft-preview-attributes-buffer-name)
- (setq buffer-read-only t)
- (let (buffer-read-only)
- (erase-buffer)
- (dolist (pair attribute-list)
- (insert (capitalize (symbol-name (car pair))) ": "
- (format "%s" (or (cdr pair) ""))
- "\n"))
- (goto-char (point-min))
- (wl-highlight-headers)))
- (select-window cur-win))))))
+ (make-local-hook 'kill-buffer-hook)
+ (add-hook 'kill-buffer-hook #'wl-draft-hide-attributes-buffer nil t)
+ (if wl-draft-preview-attributes
+ (ignore-errors ; in case when the window is too small
+ (wl-draft-show-attributes-buffer attribute-values))
+ (message (concat "Recipients: "
+ (cdr (assq 'recipients attribute-values)))))))
(defalias 'wl-draft-caesar-region 'mule-caesar-region)
(elmo-message-fetch (wl-folder-get-elmo-folder folder)
number
(elmo-make-fetch-strategy 'entire)
- nil
- (current-buffer)
'unread)
(mime-parse-buffer nil)))
(widen)
(let* ((entity (get-text-property (point) 'mime-view-entity))
(node-id (mime-entity-node-id entity))
+ (filename (mime-entity-safe-filename entity))
(header-start (mime-buffer-entity-header-start-internal entity))
(body-end (mime-buffer-entity-body-end-internal entity))
(folder (wl-folder-get-elmo-folder wl-message-buffer-cur-folder))
(with-current-buffer orig-buf
(unless (string-equal
(buffer-string)
- (elmo-message-fetch folder number
- (elmo-make-fetch-strategy 'entire)))
+ (elmo-message-fetch-string
+ folder number
+ (elmo-make-fetch-strategy 'entire)))
(error "Buffer content differs from actual message")))
(when (and (elmo-folder-writable-p folder)
(buffer-live-p orig-buf)
(insert-buffer orig-buf)
(delete-region header-start body-end)
(goto-char header-start)
- (insert "Content-Type: text/plain; charset=US-ASCII\n\n")
+ (insert "Content-Type: text/plain; charset=US-ASCII\n")
+ (when filename
+ (insert
+ "Content-Disposition:"
+ (mime-encode-field-body
+ (concat ""
+ (and filename
+ (concat " inline; filename=" (std11-wrap-as-quoted-string filename))))
+ "Content-Disposition")
+ "\n"))
+ (insert "\n")
(insert "** This part has been removed by Wanderlust **\n\n")
(elmo-folder-append-buffer folder))
(message "Cannot find pgp encrypted region")))
(message "Cannot find pgp encrypted region"))))
-(defun wl-message-verify-pgp-nonmime ()
- "Verify PGP signed region"
- (interactive)
+(defun wl-message-verify-pgp-nonmime (&optional arg)
+ "Verify PGP signed region.
+With ARG, ask coding system and encode the region with it before verifying."
+ (interactive "P")
(require 'pgg)
(save-excursion
(beginning-of-line)
- (if (and (or (re-search-forward "^-+END PGP SIGNATURE-+$" nil t)
- (re-search-backward "^-+END PGP SIGNATURE-+$" nil t))
- (re-search-backward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t))
- (let (status)
- (let* ((beg (point))
- (situation (mime-preview-find-boundary-info))
- (p-end (aref situation 1))
- (entity (aref situation 2))
- (count 0))
- (goto-char p-end)
- (while (< beg (point))
- (if (re-search-backward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t)
- (setq count (+ count 1))
- (debug)))
- (with-temp-buffer
- (set-buffer-multibyte nil)
- (insert (mime-entity-body entity))
- (goto-char (point-max))
- (while (> count 0)
- (if (re-search-backward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t)
- (setq count (- count 1))
- (debug)))
- (let ((r-beg (point))
- (r-end (re-search-forward "^-+END PGP SIGNATURE-+$" nil t)))
- (if r-end
- (setq status (pgg-verify-region r-beg r-end nil 'fetch))
- (debug)))))
- (mime-show-echo-buffer)
- (set-buffer mime-echo-buffer-name)
- (set-window-start
- (get-buffer-window mime-echo-buffer-name)
- (point-max))
- (insert-buffer-substring
- (if status pgg-output-buffer pgg-errors-buffer)))
- (message "Cannot find pgp signed region"))))
+ (let ((message-buffer (current-buffer))
+ beg end coding-system success)
+ (setq end (and (or (re-search-forward "^-+END PGP SIGNATURE-+$" nil t)
+ (re-search-backward "^-+END PGP SIGNATURE-+$" nil t)
+ (error "Cannot find pgp signed region"))
+ (match-end 0)))
+ (setq beg (or (re-search-backward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t)
+ (error "Cannot find pgp signed region")))
+ (setq coding-system
+ (or (let* ((situation (mime-preview-find-boundary-info))
+ (entity (aref situation 2)))
+ (mime-charset-to-coding-system
+ (mime-content-type-parameter
+ (mime-entity-content-type entity)
+ "charset")))
+ buffer-file-coding-system))
+ (when arg
+ (setq coding-system (read-coding-system
+ (format "Coding system (%S): " coding-system)
+ coding-system)))
+ (with-temp-buffer
+ (insert-buffer-substring message-buffer beg end)
+ (encode-coding-region (point-min) (point-max) coding-system)
+ (setq success (pgg-verify-region (point-min) (point-max) nil 'fetch)))
+ (mime-show-echo-buffer)
+ (set-buffer mime-echo-buffer-name)
+ (set-window-start
+ (get-buffer-window mime-echo-buffer-name)
+ (point-max))
+ (insert-buffer-substring
+ (if success pgg-output-buffer pgg-errors-buffer)))))
;; XXX: encrypted multipart isn't represented as multipart
(defun wl-mime-preview-application/pgp (parent-entity entity situation)
(setq entity
(car (mime-entity-children message-entity)))
(with-temp-buffer
+ (set-buffer-multibyte nil)
(insert (mime-entity-body message-entity))
(elmo-folder-append-buffer target))))
number))
(defvar wl-mime-save-directory nil "Last saved directory.")
;;; Yet another save method.
(defun wl-mime-save-content (entity situation)
- (let ((filename (read-file-name "Save to file: "
- (expand-file-name
- (or (mime-entity-safe-filename entity)
- ".")
- (or wl-mime-save-directory
- wl-temporary-file-directory)))))
+ (let ((filename (expand-file-name
+ (read-file-name "Save to file: "
+ (expand-file-name
+ (or (mime-entity-safe-filename entity)
+ ".")
+ (or wl-mime-save-directory
+ wl-temporary-file-directory))))))
(while (file-directory-p filename)
(setq filename (read-file-name "Please set filename (not directory): "
filename)))
(with-current-buffer mother
(mime-store-message/partial-piece entity situation)
(setq wl-message-buffer-cur-summary-buffer summary-buf)
- (make-variable-buffer-local 'mime-preview-over-to-next-method-alist)
+ (make-local-variable 'mime-preview-over-to-next-method-alist)
(setq mime-preview-over-to-next-method-alist
(cons (cons 'mime-show-message-mode 'wl-message-exit)
mime-preview-over-to-next-method-alist))
- (make-variable-buffer-local 'mime-preview-over-to-previous-method-alist)
+ (make-local-variable 'mime-preview-over-to-previous-method-alist)
(setq mime-preview-over-to-previous-method-alist
(cons (cons 'mime-show-message-mode 'wl-message-exit)
mime-preview-over-to-previous-method-alist)))
(elmo-folder-do-each-message-entity (entity folder)
(when (string-match
(regexp-quote subject-id)
- (elmo-message-entity-field entity 'subject 'decode))
+ (elmo-message-entity-field entity 'subject))
(let* ((message
;; request message at the cursor in Subject buffer.
(wl-message-request-partial
(mime-decrypt-application/pgp-encrypted entity situation)
(setq wl-message-buffer-cur-summary-buffer summary-buffer)
(setq wl-message-buffer-original-buffer original-buffer)))
-
+
;;; Setup methods.
(defun wl-mime-setup ()
projects / elisp / wanderlust.git / blobdiff