From: teranisi Date: Mon, 21 Aug 2000 06:47:56 +0000 (+0000) Subject: * wl-summary.el (wl-summary-jump-to-msg-by-message-id-via-nntp): X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=3bef0385b95a6572f64add12cc57f048769b6af2;p=elisp%2Fwanderlust.git * wl-summary.el (wl-summary-jump-to-msg-by-message-id-via-nntp): Follow up changes for stream-type. * wl-draft.el (wl-draft-send-mail-with-pop-before-smtp): Ditto. (wl-draft-elmo-nntp-send): Ditto. * wl-vars.el (wl-pop-before-smtp-stream-type): New variable. (wl-nntp-posting-stream-type): Ditto. (wl-pop-before-smtp-ssl): Abolished. (wl-nntp-posting-ssl): Ditto. * wl-address.el (wl-address-quote-specials): New function. (wl-address-make-completion-list): Use `wl-address-quote-specials'. * wl-draft.el (wl-draft-reply): Ditto. --- diff --git a/wl/ChangeLog b/wl/ChangeLog index dd461b8..e536b6b 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,21 @@ +2000-08-21 Yuuichi Teranishi + + * wl-summary.el (wl-summary-jump-to-msg-by-message-id-via-nntp): + Follow up changes for stream-type. + + * wl-draft.el (wl-draft-send-mail-with-pop-before-smtp): Ditto. + (wl-draft-elmo-nntp-send): Ditto. + + * wl-vars.el (wl-pop-before-smtp-stream-type): New variable. + (wl-nntp-posting-stream-type): Ditto. + (wl-pop-before-smtp-ssl): Abolished. + (wl-nntp-posting-ssl): Ditto. + + * wl-address.el (wl-address-quote-specials): New function. + (wl-address-make-completion-list): Use `wl-address-quote-specials'. + + * wl-draft.el (wl-draft-reply): Ditto. + 2000-08-16 TAKAHASHI Kaoru * wl-draft.el (wl-user-agent-compose): Add (require 'wl) for diff --git a/wl/wl-address.el b/wl/wl-address.el index 88fff82..a7eda88 100644 --- a/wl/wl-address.el +++ b/wl/wl-address.el @@ -276,6 +276,12 @@ Matched address lists are append to CL." (completing-read "To: " cl) (read-string "To: ")))) +(defun wl-address-quote-specials (word) + "Make quoted string of WORD if needed." + (if (assq 'specials (std11-lexical-analyze word)) + (prin1-to-string word) + word)) + (defun wl-address-make-completion-list (address-list) (let (addr-tuple cl) (while address-list @@ -283,7 +289,9 @@ Matched address lists are append to CL." (setq cl (cons (cons (nth 0 addr-tuple) - (concat (nth 2 addr-tuple) " <"(nth 0 addr-tuple)">")) + (concat + (wl-address-quote-specials + (nth 2 addr-tuple)) " <"(nth 0 addr-tuple)">")) cl)) ;; nickname completion. (unless (or (equal (nth 1 addr-tuple) (nth 0 addr-tuple)) @@ -292,7 +300,9 @@ Matched address lists are append to CL." (setq cl (cons (cons (nth 1 addr-tuple) - (concat (nth 2 addr-tuple) " <"(nth 0 addr-tuple)">")) + (concat + (wl-address-quote-specials + (nth 2 addr-tuple)) " <"(nth 0 addr-tuple)">")) cl))) (setq address-list (cdr address-list))) cl)) diff --git a/wl/wl-draft.el b/wl/wl-draft.el index c47a289..dc5900a 100644 --- a/wl/wl-draft.el +++ b/wl/wl-draft.el @@ -342,7 +342,9 @@ the `wl-smtp-features' variable." (setq addr (eword-extract-address-components addr)) (cons (nth 1 addr) (if (nth 0 addr) - (concat (nth 0 addr) " <" (nth 1 addr) ">") + (concat + (wl-address-quote-specials (nth 0 addr)) + " <" (nth 1 addr) ">") (nth 1 addr)))) (append to cc))))) (and subject wl-reply-subject-prefix @@ -965,8 +967,8 @@ non-nil." elmo-default-pop3-server) (or wl-pop-before-smtp-port elmo-default-pop3-port) - (or wl-pop-before-smtp-ssl - elmo-default-pop3-ssl))) + (or wl-pop-before-smtp-stream-type + elmo-default-pop3-stream-type))) (error)) (wl-draft-send-mail-with-smtp)) @@ -1411,8 +1413,8 @@ If optional argument is non-nil, current draft buffer is killed" (or wl-nntp-posting-server elmo-default-nntp-server)) (elmo-default-nntp-port (or wl-nntp-posting-port elmo-default-nntp-port)) - (elmo-default-nntp-ssl - (or wl-nntp-posting-ssl elmo-default-nntp-ssl))) + (elmo-default-nntp-stream-type + (or wl-nntp-posting-stream-type elmo-default-nntp-stream-type))) (if (not (elmo-plugged-p elmo-default-nntp-server elmo-default-nntp-port)) (wl-draft-set-sent-message 'news 'unplugged (cons elmo-default-nntp-server diff --git a/wl/wl-summary.el b/wl/wl-summary.el index c760623..412030b 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -5039,31 +5039,32 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (interactive) (let* ((msgid (elmo-string (or id (read-from-minibuffer "Message-ID: ")))) newsgroups folder ret - user server port ssl spec) + user server port type spec) (if server-spec (if (string-match "^-" server-spec) (setq spec (elmo-nntp-get-spec server-spec) user (nth 2 spec) server (nth 3 spec) port (nth 4 spec) - ssl (nth 5 spec)) + type (nth 5 spec)) (setq server server-spec))) (when (setq ret (elmo-nntp-get-newsgroup-by-msgid msgid (or server elmo-default-nntp-server) (or user elmo-default-nntp-user) (or port elmo-default-nntp-port) - (or ssl elmo-default-nntp-ssl))) + (or type elmo-default-nntp-stream-type))) (setq newsgroups (wl-parse-newsgroups ret)) (setq folder (concat "-" (car newsgroups) - (elmo-nntp-folder-postfix user server port ssl))) + (elmo-nntp-folder-postfix user server port type))) (catch 'found (while newsgroups (if (wl-folder-entity-exists-p (car newsgroups) wl-folder-newsgroups-hashtb) (throw 'found (setq folder (concat "-" (car newsgroups) - (elmo-nntp-folder-postfix user server port ssl))))) + (elmo-nntp-folder-postfix + user server port type))))) (setq newsgroups (cdr newsgroups))))) (if ret (wl-summary-jump-to-msg-internal folder nil 'update msgid) diff --git a/wl/wl-util.el b/wl/wl-util.el index 7f05b10..f6f7feb 100644 --- a/wl/wl-util.el +++ b/wl/wl-util.el @@ -30,8 +30,8 @@ ;; (provide 'wl-util) -(eval-when-compile - (provide 'elmo-util)) +;(eval-when-compile +; (provide 'elmo-util)) (condition-case () (require 'tm-edit) diff --git a/wl/wl-vars.el b/wl/wl-vars.el index 390054b..332678b 100644 --- a/wl/wl-vars.el +++ b/wl/wl-vars.el @@ -318,9 +318,9 @@ If nil, elmo-default-pop3-port is used." integer string) :group 'wl) -(defcustom wl-pop-before-smtp-ssl nil - "*Non-nil forces using SSL by default for POP-before-SMTP. -If nil, elmo-default-pop3-ssl is used." +(defcustom wl-pop-before-smtp-stream-type nil + "*Stream type for POP-before-SMTP. +If nil, elmo-default-pop3-stream-type is used." :type 'boolean :group 'wl) @@ -351,9 +351,9 @@ If nil, elmo-default-nntp-port is used." :type '(choice (const :tag "none" nil) integer string) :group 'wl) -(defcustom wl-nntp-posting-ssl nil - "*Non-nil forces using SSL to post news. -If nil, elmo-default-nntp-ssl is used." +(defcustom wl-nntp-posting-stream-type nil + "*Stream type for posting Netnews. +If nil, elmo-default-nntp-stream-type is used." :type 'boolean :group 'wl)