"\n"
smtp-end-of-line))
smtp-sasl-user-name smtp-sasl-properties sasl-read-passphrase)
- (if (and (string= (car smtp-sasl-mechanisms) "DIGEST-MD5")
- ;; sendmail bug?
- (string-match "^\\([^@]*\\)@\\([^@]*\\)"
- wl-smtp-posting-user))
- (setq smtp-sasl-user-name (match-string 1 wl-smtp-posting-user)
- smtp-sasl-properties (list 'realm
- (match-string 2 wl-smtp-posting-user)))
- (setq smtp-sasl-user-name wl-smtp-posting-user
- smtp-sasl-properties nil))
+ (setq smtp-sasl-user-name wl-smtp-posting-user
+ smtp-sasl-properties (when wl-smtp-authenticate-realm
+ (list 'realm
+ wl-smtp-authenticate-realm)))
(setq sasl-read-passphrase
(function
(lambda (prompt)
(let (references parent-folder subject)
(with-current-buffer summary-buf
(setq parent-folder (wl-summary-buffer-folder-name)))
- (setq subject (wl-draft-forward-make-subject original-subject))
+ (let ((decoder (mime-find-field-decoder 'Subject 'plain)))
+ (setq subject (if (and original-subject decoder)
+ (funcall decoder original-subject) original-subject)))
(with-current-buffer (wl-message-get-original-buffer)
+ (setq subject (wl-draft-forward-make-subject subject))
(setq references (nconc
(std11-field-bodies '("References" "In-Reply-To"))
(list (std11-field-body "Message-Id"))))
(cons 'References references))
nil nil nil nil parent-folder))
(setq wl-draft-parent-number number)
- (wl-draft-config-info-operation wl-draft-buffer-message-number 'save)
(goto-char (point-max))
(wl-draft-insert-message)
(mail-position-on-field "To")
(setq wl-draft-config-variables
(append wl-draft-parent-variables
- wl-draft-config-variables)))
+ wl-draft-config-variables))
+ (wl-draft-config-info-operation wl-draft-buffer-message-number 'save)
(run-hooks 'wl-draft-forward-hook))
(defun wl-draft-self-reply-p ()
(with-temp-buffer ; to keep raw buffer unibyte.
(set-buffer-multibyte default-enable-multibyte-characters)
(setq decoder (mime-find-field-decoder 'Subject 'plain))
- (setq subject (wl-draft-reply-make-subject
- (if (and subject decoder)
- (funcall decoder subject) subject)))
+ (setq subject (if (and subject decoder)
+ (funcall decoder subject) subject))
(setq to-alist
(mapcar
(lambda (addr)
(cons (nth 1 (std11-extract-address-components addr))
(if decoder (funcall decoder addr) addr)))
cc)))
+ (setq subject (wl-draft-reply-make-subject subject))
(setq in-reply-to (std11-field-body "Message-Id"))
(setq references (nconc
(std11-field-bodies '("References" "In-Reply-To"))
(cons 'Mail-Followup-To mail-followup-to))
nil nil nil nil parent-folder)
(setq wl-draft-parent-number number)
- (wl-draft-config-info-operation wl-draft-buffer-message-number 'save)
(setq wl-draft-reply-buffer buf)
(setq wl-draft-config-variables
(append wl-draft-parent-variables
- wl-draft-config-variables)))
+ wl-draft-config-variables))
+ (wl-draft-config-info-operation wl-draft-buffer-message-number 'save))
(run-hooks 'wl-draft-reply-hook))
(defun wl-draft-reply-position (position)
(re-search-forward "\n[ \t]*\n\n*" nil t))
(replace-match "\n"))
(goto-char (point-min))
- (while (re-search-forward
+ (while (re-search-forward
"^[^ \t\n:]+:[ \t]*\\(.*\\(\n[ \t].*\\)*\\)\n"
nil t)
(when (string= "" (match-string 1))
(t
(throw 'done nil)))))))
(quit nil))
- (when wl-draft-send-confirm-with-preview
- (mime-preview-quit)))))
+ (when (and wl-draft-send-confirm-with-preview
+ (eq major-mode 'mime-view-mode))
+ (wl-mime-quit-preview)))))
(defun wl-draft-send (&optional kill-when-done mes-string)
"Send current draft message.
" *wl-draft-sending-buffer*"
(append wl-draft-config-variables
(wl-draft-clone-local-variables))))
+ (parent-flag wl-draft-parent-flag)
+ (parent-number wl-draft-parent-number)
+ (parent-folder wl-draft-parent-folder)
(wl-draft-verbose-msg nil)
err)
(unwind-protect
;;
(if wl-draft-verbose-send
(message "%s" (or mes-string "Sending...")))
+ ;; Set flag before send-function because
+ ;; there's no need to change current mailbox at this time.
+ ;; If flag is set after send-function, the current mailbox
+ ;; might changed by Fcc.
+ ;; It causes a huge loss in the IMAP folder.
+ (when (and parent-flag parent-number
+ (not (eq (length parent-folder) 0)))
+ (wl-folder-set-persistent-mark
+ parent-folder parent-number parent-flag))
(funcall wl-draft-send-function editing-buffer kill-when-done)
;; Now perform actions on successful sending.
(while mail-send-actions
(message "%sdone"
(or wl-draft-verbose-msg
mes-string
- "Sending...")))
- (with-current-buffer sending-buffer
- (when (and wl-draft-parent-flag
- wl-draft-parent-number
- wl-draft-parent-folder
- (wl-draft-set-flag-on-parent wl-draft-parent-flag))))
+ "Sending..."))))
;; kill sending buffer, anyway.
(and (buffer-live-p sending-buffer)
(kill-buffer sending-buffer))))))
(goto-char (point-max))
(insert-buffer-substring send-mail-buffer header-end)
(let ((id (std11-field-body "Message-ID"))
- (elmo-enable-disconnected-operation t)
- cache-saved)
+ (elmo-enable-disconnected-operation t))
(while fcc-list
- (unless (or cache-saved
- (elmo-folder-plugged-p
- (wl-folder-get-elmo-folder (car fcc-list))))
- (elmo-file-cache-save id nil) ;; for disconnected operation
- (setq cache-saved t))
(if (elmo-folder-append-buffer
(wl-folder-get-elmo-folder
(eword-decode-string (car fcc-list)))
(let (wl-demo)
(wl-init)) ; returns immediately if already initialized.
-
+ (wl-set-save-drafts)
(let (buffer header-alist-internal)
(setq buffer (wl-draft-create-buffer parent-folder))
(unless (cdr (assq 'From header-alist))
(eq this-command 'wl-summary-forward)
(eq this-command 'wl-summary-target-mark-forward)
(eq this-command 'wl-summary-target-mark-reply-with-citation)))
- (buffer (generate-new-buffer "*draft*")) ; Just for initial name.
- change-major-mode-hook)
+ (buffer (generate-new-buffer "*draft*"))) ; Just for initial name.
(set-buffer buffer)
;; switch-buffer according to draft buffer style.
(if wl-draft-use-frame
(funcall wl-draft-buffer-style buffer)
(error "Invalid value for wl-draft-buffer-style"))))))
(auto-save-mode -1)
- (wl-draft-mode)
+ (let (change-major-mode-hook)
+ (wl-draft-mode))
(set-buffer-multibyte t) ; draft buffer is always multibyte.
(make-local-variable 'truncate-partial-width-windows)
(setq truncate-partial-width-windows nil)
wl-user-agent-headers-and-body-alist 'ignore-case)))))
t))
-(defun wl-draft-set-flag-on-parent (flag)
- "Set FLAG on parent message."
- (let ((buffer (wl-summary-get-buffer wl-draft-parent-folder))
- (number wl-draft-parent-number)
- folder)
- (if buffer
- (with-current-buffer buffer
- (wl-summary-set-persistent-mark flag number))
- ;; Parent buffer does not exist.
- (when (setq folder (and wl-draft-parent-folder
- (wl-folder-get-elmo-folder
- wl-draft-parent-folder)))
- (elmo-folder-open folder 'load-msgdb)
- (elmo-folder-set-flag folder (list wl-draft-parent-number) flag)
- (elmo-folder-close folder)))))
-
(defun wl-draft-setup-parent-flag (flag)
"Setup a FLAG for parent message."
(when (and (> (length wl-draft-parent-folder) 0)
projects / elisp / wanderlust.git / blobdiff