X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl-mime.el;h=26a405263974cdb0c56eda4f91d59a295f2cb5a1;hb=4dee2f09b7c63b19e24942f13b2917addb2a6501;hp=65273655f275f3056111aec48f8229edabde907d;hpb=42640eb0732a3fb1ae27381ae91d562db2fb9572;p=elisp%2Fwanderlust.git diff --git a/wl/wl-mime.el b/wl/wl-mime.el index 6527365..26a4052 100644 --- a/wl/wl-mime.el +++ b/wl/wl-mime.el @@ -28,11 +28,11 @@ ;;; Code: ;; - (require 'mime-view) (require 'mime-edit) (require 'mime-play) (require 'elmo) +(require 'wl-vars) (eval-when-compile (defalias-maybe 'pgg-decrypt-region 'ignore) @@ -70,11 +70,9 @@ has Non-nil value\)" ((wl-region-exists-p) (wl-mime-preview-follow-current-region)) ((not (wl-message-mime-analysis-p - (get-text-property (point-min) - 'wl-message-display-type))) + (wl-message-buffer-display-type))) (wl-mime-preview-follow-no-mime - (get-text-property (point-min) - 'wl-message-display-type))) + (wl-message-buffer-display-type))) (t (mime-preview-follow-current-entity))))) (error "No message.")))) @@ -103,7 +101,7 @@ It calls following-method selected from variable (goto-char (point-min)) ;; Insert all headers. (let ((elmo-mime-display-header-analysis - (wl-message-mime-analysis-p display-type))) + (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) @@ -178,6 +176,51 @@ It calls following-method selected from variable (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 + (append (and (wl-message-mail-p) + (cdr (assq 'mail wl-draft-preview-attributes-list))) + (and (wl-message-news-p) + (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 @@ -208,6 +251,36 @@ It calls following-method selected from variable (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 + 'point + '(wl-nntp-posting-port elmo-nntp-default-port))) + (defun wl-draft-attribute-value (attr) (let ((name (symbol-name attr)) fsymbol symbol) @@ -237,7 +310,7 @@ It calls following-method selected from variable (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) @@ -251,29 +324,30 @@ It calls following-method selected from variable (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) @@ -283,46 +357,13 @@ It calls following-method selected from variable (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) @@ -355,8 +396,6 @@ It calls following-method selected from variable (elmo-message-fetch (wl-folder-get-elmo-folder folder) number (elmo-make-fetch-strategy 'entire) - nil - (current-buffer) 'unread) (mime-parse-buffer nil))) @@ -395,8 +434,9 @@ It calls following-method selected from variable (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)