From: teranisi Date: Thu, 1 Mar 2001 02:02:31 +0000 (+0000) Subject: Synch up with main trunk and so on. X-Git-Tag: wl-2_8-root^2~13 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebdd9ad19bf585992593d758949cebf11bde3eac;p=elisp%2Fwanderlust.git Synch up with main trunk and so on. --- diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi index 3dfa134..1d9c63a 100644 --- a/doc/wl-ja.texi +++ b/doc/wl-ja.texi @@ -533,9 +533,9 @@ Wanderlust $B$NF0:n$r%+%9%?%^%$%:$G$-$^$9!#(B (setq wl-icon-dir "~/work/wl/etc") ;; @r{$B%a!<%k$rAw?.$9$k(B SMTP $B%5!<%P!#(B $B=i4|@_Dj$O(B @code{nil}$B!#(B} -(setq wl-smtp-posting-server "your.smtp.server.com") +(setq wl-smtp-posting-server "your.smtp.example.com") ;; @r{$B%K%e!<%9Ej9FMQ$N(B NNTP $B%5!<%P!#(B $B=i4|@_Dj$O(B @code{nil}$B!#(B} -(setq wl-nntp-posting-server "your.nntp.server.com") +(setq wl-nntp-posting-server "your.nntp.example.com") @end group @end lisp @@ -655,14 +655,14 @@ LDAP $B$rMxMQ$9$k>l9g$O!"(B@code{wl-ldap-server}$B!"(B@code{wl-ldap-port}, %inbox "$B$7$^$9! @findex wl-summary-down $B2l9g$O!"(B +$B$^$H$a=hM}%^!<%/(B @samp{*} $B$,$D$$$?%a%C%;!<%8$KM%@hE*$K0\F0$7$^$9!#(B +$B$3$N5sF0$O(B @code{wl-summary-move-order}$B$NCM$K1~$8$FJQ$o$j$^$9!#(B (@code{wl-summary-down}) @item P @@ -2833,6 +2836,9 @@ prefix argument $B$D$-$J$i$P%-%c%C%7%e$,B8:_$7$F$bL5;k$7$F:FFI$_9~$_$7D>$7$^$9! @findex wl-summary-up $B>eJ}8~$K$"$kL$FI$b$7$/$O(B @samp{$}$B%^!<%/$D$-$N%a%C%;!<%8$X0\F0$7$^$9!#(B $B%*%U%i%$%s%b!<%I$N$H$-$K$O!"%-%c%C%7%e$5$l$F$$$J$$%a%C%;!<%8$K0\F0$7$^$;$s!#(B +$B$?$@$7!"$^$H$a=hM}%^!<%/(B @samp{*} $B$,$D$$$?%a%C%;!<%8$,$"$k>l9g$O!"(B +$B$^$H$a=hM}%^!<%/(B @samp{*} $B$,$D$$$?%a%C%;!<%8$KM%@hE*$K0\F0$7$^$9!#(B +$B$3$N5sF0$O(B @code{wl-summary-move-order}$B$NCM$K1~$8$FJQ$o$j$^$9!#(B (@code{wl-summary-up}) @item w @@ -3728,13 +3734,13 @@ nil $B$J$i!"(Bmime-view-visible-field-list $B$NCM$,;H$o$l$^$9!#(B @lisp @group (setq wl-draft-config-alist - '(((string-match "aaa.ne.jp$" (system-name)) + '(((string-match "aaa.example.com$" (system-name)) ;; @r{$B<0$,(Bnon-nil$B$J$iE,MQ$9$k(B} (wl-smtp-posting-server . "mailserver-B") (wl-nntp-posting-server . "newsserver-B") ;; @r{$B0l;~E*$JJQ?t$N@_Dj(B} ) - ("^To: .*user@@aaa.bbb.com" + ("^To: .*user@@aaa.bbb.example.com" ;; @r{$B%I%i%U%H%P%C%U%!$N%X%C%@$K%^%C%A$9$l$PE,MQ$9$k(B} ("Organization" . (format "Go %s" my-webpage))) ;; @r{elisp $B<0$,=q$1$k(B (eval $B$7$F$$$k$@$1(B)} @@ -3862,7 +3868,7 @@ nil $B$J$i!"(Bmime-view-visible-field-list $B$NCM$,;H$o$l$^$9!#(B (body . " $B!{!{$G$9!#(B\n")) ("report" (template . "default") ;; @r{(a)} - ("To" . "jousi@@kaisha.jp") + ("To" . "jousi@@example.com") ("Subject" . "$BJs9p(B") (body-file . "~/work/report.txt") ) diff --git a/doc/wl.texi b/doc/wl.texi index 146f53e..8dff6d0 100644 --- a/doc/wl.texi +++ b/doc/wl.texi @@ -243,7 +243,7 @@ FLIM: ftp://ftp.m17n.org/pub/mule/flim/ @end group @end example -You have to install APEL, FLIM and SEMI in this order. Generally +You have to install APEL, FLIM and SEMI in this order. Generally, @samp{make install} will do the job. (In XEmacs 21, @samp{make install-package}.) @@ -254,7 +254,7 @@ Recommended combination of APEL, FLIM and SEMI are following: @end itemize You can also use many other FLIM/SEMI variants. Combination of the -latest versions should work. For example, following combination is +latest versions should work. For example, the following combination are confirmed to work. @itemize @minus @@ -502,9 +502,9 @@ The minimal requirement for settings is as the following. (setq wl-icon-dir "~/work/wl/etc") ;; @r{SMTP server for mail posting. Default: @code{nil}} -(setq wl-smtp-posting-server "your.smtp.server.com") +(setq wl-smtp-posting-server "your.smtp.example.com") ;; @r{NNTP server for news posting. Default: @code{nil}} -(setq wl-nntp-posting-server "your.nntp.server.com") +(setq wl-nntp-posting-server "your.nntp.example.com") @end group @end lisp @@ -630,14 +630,14 @@ Format for @file{~/.folders} is very simple. Here is an example: %inbox "Inbox" +trash "Trash" +draft "Drafts" -%#mh/Backup@@my.imap.server.com "Sent" +%#mh/Backup@@my.imap.example.com "Sent" # Folder Group Emacsen@{ %#mh/spool/wl "Wanderlust ML" %#mh/spool/elips "ELIPS ML" %#mh/spool/apel-ja "APEL Japanese ML" %#mh/spool/xemacs-beta "XEmacs beta" - -fj.news.reader.gnus@@other.nntp.server.com "Gnus Net news" + -fj.news.reader.gnus@@other.nntp.example.com "Gnus Net news" *-fj.editor.xemacs,-fj.editor.mule,-fj.editor.emacs "fj's Emacsen" @} # @@ -2820,6 +2820,11 @@ yet. @findex wl-summary-down Move cursor to the downward message which is unread or marked as @samp{$}. +In the offline mode, cursor is not moved to the messages which are not cached +yet. +If there are messages which have target mark @samp{*} in the summary, +cursor is moved to the downward message which have a target mark. +This behavior is changed according to the value of @code{wl-summary-move-order}. (@code{wl-summary-down}) @item P @@ -2827,6 +2832,11 @@ as @samp{$}. @findex wl-summary-up Move cursor to the upward message which is unread or marked as @samp{$}. +In the offline mode, cursor is not moved to the messages which are not cached +yet. +If there are messages which have target mark @samp{*} in the summary, +cursor is moved to the downward message which have a target mark. +This behavior is changed according to the value of @code{wl-summary-move-order}. (@code{wl-summary-up}) @item w @@ -3731,13 +3741,13 @@ before sending the message. @lisp @group (setq wl-draft-config-alist - '(((string-match "aaa.ne.jp$" (system-name)) + '(((string-match "aaa.example.com$" (system-name)) ;; @r{applied if the expression is non-nil} (wl-smtp-posting-server . "mailserver-B") (wl-nntp-posting-server . "newsserver-B") ;; @r{settings of temporary variables} ) - ("^To: .*user@@aaa.bbb.com" + ("^To: .*user@@aaa.bbb.example.com" ;; @r{applied if it matches the header of the draft buffer} ("Organization" . (format "Go %s" my-webpage))) ;; @r{you can write elisp expressions here (eval only)} @@ -3872,7 +3882,7 @@ The format of @code{wl-template-alist} is almost the same as (body . "Hello.\n")) ("report" (template . "default") ;; @r{(a)} - ("To" . "jousi@@kaisha.jp") + ("To" . "boss@@example.com") ("Subject" . "Report") (body-file . "~/work/report.txt") ) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 7d447a3..ef81e12 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,11 @@ +2001-03-01 Yuuichi Teranishi + + * mmimap.el (mmimap-parse-parameters-from-list): Define as alias for + `mime-decode-parameters' instead of `mime-decode-parameter-plist'. + + * elmo-msgdb.el (elmo-msgdb-search-internal-primitive): Bind + case-fold-search. + 2001-02-28 Yuuichi Teranishi * elmo-util.el (elmo-resque-obsolete-variable): Use defvaralias if diff --git a/elmo/elmo-msgdb.el b/elmo/elmo-msgdb.el index 04f9df4..2ff28cd 100644 --- a/elmo/elmo-msgdb.el +++ b/elmo/elmo-msgdb.el @@ -276,6 +276,7 @@ header separator." (defun elmo-msgdb-search-internal-primitive (condition entity number-list) (let ((key (elmo-filter-key condition)) + (case-fold-search t) result) (cond ((string= key "last") diff --git a/elmo/mmimap.el b/elmo/mmimap.el index ff607e5..54a5faf 100644 --- a/elmo/mmimap.el +++ b/elmo/mmimap.el @@ -66,8 +66,8 @@ SECTION is a section string which is defined in RFC2060.") (reverse node-id) ".")))) -(static-if (fboundp 'mime-decode-parameter-plist) - (defalias 'mmimap-parse-parameters-from-list 'mime-decode-parameter-plist) +(static-if (fboundp 'mime-decode-parameters) + (defalias 'mmimap-parse-parameters-from-list 'mime-decode-parameters) (defun mmimap-parse-parameters-from-list (attrlist) "Parse parameters from ATTRLIST." (let (ret-val) diff --git a/wl/ChangeLog b/wl/ChangeLog index bfff74b..5338f90 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,10 @@ +2001-03-01 Yuuichi Teranishi + + * wl-folder.el (wl-make-plugged-alist): Use `wl-nntp-posting-port' + instead of `elmo-nntp-default-port'. + + * wl-vars.el: Fixed some doc strings. + 2001-02-28 Yuuichi Teranishi * wl-summary.el (wl-summary-prefetch-msg): Use @@ -100,6 +107,44 @@ * wl-summary.el (wl-summary-default-subject-filter): Fix for `Re>'. * wl-vars.el (wl-summary-search-parent-by-subject-regexp): Ditto. +2001-03-01 Yuuichi Teranishi + + * wl-summary.el (wl-summary-next-message): + Return next message number when wl-summary-move-order is nil. + +2001-02-28 Akihiro MOTOKI + + * wl-summary.el (wl-summary-move-spec-plugged-alist): Renamed from + `wl-summary-move-spec-alist'. + (wl-summary-move-spec-unplugged-alist): New variable + (Move spec for unplugged status). + (wl-summary-next-message): Use `wl-summary-move-spec-plugged-alist' + if plugged, `wl-summary-move-spec-unplugged-alist' is unplugged. + +2001-03-01 OKAZAKI Tetsurou + + * wl-e21.el (wl-draft-overload-menubar): "FCC" -> "Fcc". + * wl-mule.el (wl-draft-overload-menubar): Ditto. + +2001-02-28 OKAZAKI Tetsurou + + * wl-mime.el (wl-draft-preview-message): Use `function' instead of + simple quotation to quote the anonymous function. + * tm-wl.el (wl-draft-preview-message): Ditto. + +2001-02-25 OKAZAKI Tetsurou + + * wl-highlight.el (wl-highlight-summary-displaying): Optimize; + Eliminate redundant `save-excursion'. + (wl-highlight-summary-current-line): Ditto. + + * wl-highlight.el (wl-highlight-summary-current-line): Avoid + accessing match data when `looking-at' failed. + + * wl-draft.el (wl-draft-delete): Use `match-string' instead of + `elmo-match-string' where users don't care about the speed. + (wl-draft-save): Ditto. + 2001-02-24 Yuuichi Teranishi * wl-util.el (wl-regexp-opt): New function. diff --git a/wl/tm-wl.el b/wl/tm-wl.el index cfbc754..565f823 100644 --- a/wl/tm-wl.el +++ b/wl/tm-wl.el @@ -68,7 +68,9 @@ By setting following-method as yank-content." (mime-viewer/ignored-field-regexp "^:$") (mime-editor/translate-buffer-hook (append - '((lambda () + (list + (function + (lambda () (let ((wl-draft-config-exec-flag config-exec-flag)) (run-hooks 'wl-draft-send-hook) (setq recipients-message @@ -86,7 +88,7 @@ By setting following-method as yank-content." "$") nil t) (point))) - ", ")))))) + ", "))))))) mime-editor/translate-buffer-hook))) (mime-editor/preview-message) (let ((buffer-read-only nil)) diff --git a/wl/wl-draft.el b/wl/wl-draft.el index ed7035b..212f274 100644 --- a/wl/wl-draft.el +++ b/wl/wl-draft.el @@ -673,7 +673,7 @@ Reply to author if WITH-ARG is non-nil." (let ((msg (and wl-draft-buffer-file-name (string-match "[0-9]+$" wl-draft-buffer-file-name) (string-to-int - (elmo-match-string 0 wl-draft-buffer-file-name))))) + (match-string 0 wl-draft-buffer-file-name))))) (wl-draft-config-info-operation msg 'delete)))) (set-buffer-modified-p nil) ; force kill (kill-buffer editing-buffer)))) @@ -1134,7 +1134,7 @@ If optional argument is non-nil, current draft buffer is killed" (wl-draft-config-info-operation (and (string-match "[0-9]+$" wl-draft-buffer-file-name) (string-to-int - (elmo-match-string 0 wl-draft-buffer-file-name))) + (match-string 0 wl-draft-buffer-file-name))) 'save)) (defun wl-draft-mimic-kill-buffer () diff --git a/wl/wl-e21.el b/wl/wl-e21.el index 86129aa..dab784a 100644 --- a/wl/wl-e21.el +++ b/wl/wl-e21.el @@ -584,7 +584,7 @@ (define-key keymap [menu-bar mail signature] '("Insert Signature" . insert-signature)) (define-key keymap [menu-bar headers fcc] - '("FCC" . wl-draft-fcc)))) + '("Fcc" . wl-draft-fcc)))) (defun wl-draft-mode-setup () (require 'derived) diff --git a/wl/wl-folder.el b/wl/wl-folder.el index 2b4e2a9..902a7ce 100644 --- a/wl/wl-folder.el +++ b/wl/wl-folder.el @@ -998,11 +998,11 @@ If current line is group folder, check all sub entries." (setq unread (or (cadr nums) 0)) (if (or (not unread-only) (or (< 0 new) (< 0 unread))) - (save-window-excursion - (save-excursion - (let ((wl-summary-buffer-name (concat - wl-summary-buffer-name - (symbol-name this-command)))) + (let ((wl-summary-buffer-name (concat + wl-summary-buffer-name + (symbol-name this-command)))) + (save-window-excursion + (save-excursion (wl-summary-goto-folder-subr entity (wl-summary-get-sync-range folder) @@ -1454,17 +1454,16 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'." (if (get-buffer wl-folder-buffer-name) (switch-to-buffer wl-folder-buffer-name) (switch-to-buffer (get-buffer-create wl-folder-buffer-name)) + (set-buffer wl-folder-buffer-name) (wl-folder-mode) - (sit-for 0) (wl-folder-init) - (set-buffer wl-folder-buffer-name) + (sit-for 0) (let ((inhibit-read-only t) (buffer-read-only nil)) (erase-buffer) (setcdr (assoc (car wl-folder-entity) wl-folder-group-alist) t) (save-excursion (wl-folder-insert-entity " " wl-folder-entity))) - (sit-for 0) (set-buffer-modified-p nil) (setq initialize t)) initialize)) @@ -1965,7 +1964,7 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'." (elmo-set-plugged wl-plugged wl-nntp-posting-server wl-nntp-posting-stream-type - elmo-nntp-default-port + wl-nntp-posting-port nil nil "nntp" add)) (run-hooks 'wl-make-plugged-hook))) diff --git a/wl/wl-highlight.el b/wl/wl-highlight.el index ffb9e9c..bf05fc1 100644 --- a/wl/wl-highlight.el +++ b/wl/wl-highlight.el @@ -748,9 +748,10 @@ (wl-delete-all-overlays) (let (bol eol ov) (save-excursion + (end-of-line) + (setq eol (point)) (beginning-of-line) (setq bol (point)) - (save-excursion (end-of-line) (setq eol (point))) (setq ov (make-overlay bol eol)) (overlay-put ov 'face 'wl-highlight-summary-displaying-face) (overlay-put ov 'evaporate t) @@ -839,14 +840,16 @@ wl-highlight-thread-indent-string-regexp "\\)[[<]")) fregexp fsymbol bol eol matched thread-top looked-at) + (end-of-line) + (setq eol (point)) (beginning-of-line) (setq bol (point)) - (save-excursion (end-of-line) (setq eol (point))) (if smark (setq status-mark smark) (setq looked-at (looking-at sregexp)) - (setq status-mark (buffer-substring (match-beginning 2) - (match-end 2)))) + (when looked-at + (setq status-mark (buffer-substring (match-beginning 2) + (match-end 2))))) (when temp-too (unless looked-at (setq looked-at (looking-at sregexp))) diff --git a/wl/wl-mime.el b/wl/wl-mime.el index 8eeba59..7126d25 100644 --- a/wl/wl-mime.el +++ b/wl/wl-mime.el @@ -74,10 +74,12 @@ By setting following-method as yank-content." (let* (recipients-message (config-exec-flag wl-draft-config-exec-flag) (mime-display-header-hook 'wl-highlight-headers) - mime-view-ignored-field-list ; all header. + mime-view-ignored-field-list ; all header. (mime-edit-translate-buffer-hook (append - '((lambda () + (list + (function + (lambda () (let ((wl-draft-config-exec-flag config-exec-flag)) (run-hooks 'wl-draft-send-hook) (setq recipients-message @@ -96,7 +98,7 @@ By setting following-method as yank-content." "$") nil t) (point))) - ", ")))))) + ", "))))))) mime-edit-translate-buffer-hook))) (mime-edit-preview-message) (let ((buffer-read-only nil)) diff --git a/wl/wl-mule.el b/wl/wl-mule.el index ad63c74..bf29d38 100644 --- a/wl/wl-mule.el +++ b/wl/wl-mule.el @@ -171,7 +171,7 @@ Special commands: (local-set-key [menu-bar mail signature] '("Insert Signature" . insert-signature)) (local-set-key [menu-bar headers fcc] - '("FCC" . wl-draft-fcc))) + '("Fcc" . wl-draft-fcc))) (defun wl-draft-overload-functions () (wl-mode-line-buffer-identification) diff --git a/wl/wl-summary.el b/wl/wl-summary.el index 28aaa08..ebbf027 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -4311,7 +4311,7 @@ If ARG, exit virtual folder." (wl-match-string 1 wday-str) (elmo-date-get-week year month mday)))) -(defvar wl-summary-move-spec-alist +(defvar wl-summary-move-spec-plugged-alist (` ((new . ((t . nil) (p . (, wl-summary-new-mark)) (p . (, (wl-regexp-opt @@ -4325,34 +4325,47 @@ If ARG, exit virtual folder." wl-summary-unread-cached-mark)))) (p . (, (regexp-quote wl-summary-important-mark)))))))) +(defvar wl-summary-move-spec-unplugged-alist + (` ((new . ((t . nil) + (p . (, wl-summary-unread-cached-mark)) + (p . (, (regexp-quote wl-summary-important-mark))))) + (unread . ((t . nil) + (p . (, wl-summary-unread-cached-mark)) + (p . (, (regexp-quote wl-summary-important-mark)))))))) + (defsubst wl-summary-next-message (num direction hereto) (let ((cur-spec (cdr (assq wl-summary-move-order - wl-summary-move-spec-alist))) + (if (elmo-folder-plugged-p + wl-summary-buffer-elmo-folder) + wl-summary-move-spec-plugged-alist + wl-summary-move-spec-unplugged-alist)))) (nums (memq num (if (eq direction 'up) (reverse wl-summary-buffer-number-list) wl-summary-buffer-number-list))) marked-list nums2) (unless hereto (setq nums (cdr nums))) (setq nums2 nums) - (catch 'done - (while cur-spec - (setq nums nums2) - (cond ((eq (car (car cur-spec)) 'p) - (if (setq marked-list (elmo-folder-list-messages-mark-match - wl-summary-buffer-elmo-folder - (cdr (car cur-spec)))) - (while nums - (if (memq (car nums) marked-list) - (throw 'done (car nums))) - (setq nums (cdr nums))))) - ((eq (car (car cur-spec)) 't) - (while nums - (if (and wl-summary-buffer-target-mark-list - (memq (car nums) - wl-summary-buffer-target-mark-list)) - (throw 'done (car nums))) - (setq nums (cdr nums))))) - (setq cur-spec (cdr cur-spec)))))) + (if cur-spec + (catch 'done + (while cur-spec + (setq nums nums2) + (cond ((eq (car (car cur-spec)) 'p) + (if (setq marked-list (elmo-folder-list-messages-mark-match + wl-summary-buffer-elmo-folder + (cdr (car cur-spec)))) + (while nums + (if (memq (car nums) marked-list) + (throw 'done (car nums))) + (setq nums (cdr nums))))) + ((eq (car (car cur-spec)) 't) + (if wl-summary-buffer-target-mark-list + (while nums + (if (memq (car nums) + wl-summary-buffer-target-mark-list) + (throw 'done (car nums))) + (setq nums (cdr nums)))))) + (setq cur-spec (cdr cur-spec)))) + (car nums)))) (defsubst wl-summary-cursor-move (direction hereto) (when (and (eq direction 'up) @@ -4714,6 +4727,7 @@ Return t if message exists." (wl-summary-jump-to-msg-internal (wl-summary-buffer-folder-name) original 'no-sync)) (cond ((eq wl-summary-search-via-nntp 'confirm) + (require 'elmo-nntp) (message "Search message in nntp server \"%s\" ?" elmo-nntp-default-server) (setq schar (read-char)) diff --git a/wl/wl-vars.el b/wl/wl-vars.el index bd5bc77..0b5bd54 100644 --- a/wl/wl-vars.el +++ b/wl/wl-vars.el @@ -301,7 +301,7 @@ If nil, don't authenticate." (defcustom wl-pop-before-smtp-user nil "*POP3 user name to send mail using POP-before-SMTP. -If nil, `elmo-default-pop3-user' is used. +If nil, `elmo-pop3-default-user' is used. To use POP-before-SMTP, (setq wl-draft-send-mail-function 'wl-draft-send-mail-with-pop-before-smtp)" :type '(choice (const :tag "none" nil) @@ -310,27 +310,27 @@ To use POP-before-SMTP, (defcustom wl-pop-before-smtp-server nil "*POP3 server for POP-before-SMTP. -If nil, `elmo-default-pop3-server' is used." +If nil, `elmo-pop3-default-server' is used." :type '(choice (const :tag "none" nil) string) :group 'wl) (defcustom wl-pop-before-smtp-port nil "*POP3 port for POP-before-SMTP. -If nil, `elmo-default-pop3-port' is used." +If nil, `elmo-pop3-default-port' is used." :type '(choice (const :tag "none" nil) integer string) :group 'wl) (defcustom wl-pop-before-smtp-stream-type nil "*Stream type for POP-before-SMTP. -If nil, `elmo-default-pop3-stream-type' is used." +If nil, `elmo-pop3-default-stream-type' is used." :type 'boolean :group 'wl) (defcustom wl-pop-before-smtp-authenticate-type nil "*Default Authentication type for POP-before-SMTP. -If nil, `elmo-default-pop3-authenticate-type' is used." +If nil, `elmo-pop3-default-authenticate-type' is used." :type '(choice (const :tag "none" nil) (const :tag "APOP" "apop") (const :tag "POP3" "user")) @@ -338,26 +338,26 @@ If nil, `elmo-default-pop3-authenticate-type' is used." (defcustom wl-nntp-posting-server nil "*NNTP server name to post news. -If nil, `elmo-default-nntp-server' is used." +If nil, `elmo-nntp-default-server' is used." :type '(choice (const :tag "none" nil) string) :group 'wl) (defcustom wl-nntp-posting-user nil "*NNTP user name to post news for authinfo. -If nil, `elmo-default-nntp-user' is used. +If nil, `elmo-nntp-default-user' is used. If nil, don't authenticate." :type '(choice (const :tag "none" nil) string) :group 'wl) (defcustom wl-nntp-posting-port nil "*NNTP port to post news. -If nil, `elmo-default-nntp-port' is used." +If nil, `elmo-nntp-default-port' is used." :type '(choice (const :tag "none" nil) integer string) :group 'wl) (defcustom wl-nntp-posting-stream-type nil "*Stream type for posting Netnews. -If nil, `elmo-default-nntp-stream-type' is used." +If nil, `elmo-nntp-default-stream-type' is used." :type 'boolean :group 'wl)