From 3515ff57ebad106f71471ebb435b1a577ef1e505 Mon Sep 17 00:00:00 2001 From: kaoru Date: Mon, 21 May 2001 06:19:31 +0000 Subject: [PATCH] Synch with main trunk. --- doc/texinfo.tex | 11 ++++++----- doc/wl-ja.texi | 33 +++++++++++++++++++++++---------- doc/wl.texi | 31 ++++++++++++++++++++++--------- 3 files changed, 51 insertions(+), 24 deletions(-) diff --git a/doc/texinfo.tex b/doc/texinfo.tex index 5b405a6..0b5b903 100644 --- a/doc/texinfo.tex +++ b/doc/texinfo.tex @@ -3,10 +3,10 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2001-02-02.17} +\def\texinfoversion{2001-03-28.08} % -% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000 -% Free Software Foundation, Inc. +% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, +% 2000, 01 Free Software Foundation, Inc. % % This texinfo.tex file is free software; you can redistribute it and/or % modify it under the terms of the GNU General Public License as @@ -932,7 +932,7 @@ where each line of input produces a line of output.} \ifnum\pdftexversion < 14 \else \pdfrefximage \pdflastximage \fi} - \def\pdfmkdest#1{\pdfdest name{#1@} xyz} + \def\pdfmkdest#1{\pdfdest name{#1} xyz} \def\pdfmkpgn#1{#1@} \let\linkcolor = \Blue % was Cyan, but that seems light? \def\endlink{\Black\pdfendlink} @@ -5848,7 +5848,8 @@ width0pt\relax} \fi \setbox0 = \hbox{\ignorespaces #2}\ifdim\wd0 > 0pt \epsfxsize=#2\relax \fi \setbox0 = \hbox{\ignorespaces #3}\ifdim\wd0 > 0pt \epsfysize=#3\relax \fi \begingroup - \catcode`\^^M = 5 % in case we're inside an example + \catcode`\^^M = 5 % in case we're inside an example + \normalturnoffactive % allow _ et al. in names % If the image is by itself, center it. \ifvmode \nobreak\bigskip diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi index 115ea72..22c4ad8 100644 --- a/doc/wl-ja.texi +++ b/doc/wl-ja.texi @@ -5,7 +5,7 @@ @c %**end of header @documentlanguage ja @documentencoding iso-2022-jp -@set VERSION 2.5.8 +@include version.texi @synindex pg cp @finalout @@ -776,9 +776,9 @@ default $BCM(B: $B=i4|@_Dj$O(B $B4D6-JQ?t(B @env{USER} $B$+!"(B@env{LOGNAME} $B$+!"(B @code{(user-login-name)} $B$NJV$jCM!#(B $BG'>ZK!(B -> $BJQ?t(B @code{elmo-default-imap4-authenticate-type} $B$NCM!#(B - $B=i4|@_Dj$O(B 'login$B!#(B + $B=i4|@_Dj$O(B @code{login}$B!#(B $B%[%9%HL>(B -> $BJQ?t(B @code{elmo-default-imap4-server} $B$NCM!#(B - $B=i4|@_Dj$O(B "localhost"$B!#(B + $B=i4|@_Dj$O(B @samp{localhost}$B!#(B $B%]!<%HHV9f(B-> $BJQ?t(B @code{elmo-default-imap4-port} $B$NCM!#(B $B=i4|@_Dj$O(B 143$B!#(B @end example @@ -788,11 +788,21 @@ default $BCM(B: $B%$%"%&%)!<%k$r1[$($J$1$l$P$J$i$J$$>l9g$G$b(B @samp{foo%imap@@gateway} $B$N$h(B $B$&$K;XDj$G$-$^$9!#(B +@lisp +;; $BNc(B: imap4.exaple.org $B$r%a%$%s$G;HMQ$9$k(B IMAP $B%5!<%P$H$7$F@_Dj(B +(setq elmo-default-imap4-server "imap4.example.org") +@end lisp + $B%U%)%k%@L>$N:G8e$K(B @samp{!} $B$,IU$$$F$$$k$H!"(BSSL (Secure Socket Layer)$B$r(B $BMxMQ$7$F%3%M%/%7%g%s$rD%$j$^$9!#(B@samp{!!} $B$@$H!"(BSTARTTLS $B$K$h$j(BSSL$B%3%M%/(B $B%7%g%s$rD%$j$^$9!#JQ?t(B @code{elmo-default-imap4-stream-type} $B$NCM$,(B -non-nil $B$J$i!"(B@samp{!} $B$rIU$1$J$/$F$b(B SSL $B$r;H$$$^$9!#(B'starttls $B$J$i(B -@samp{!!} $B$r0UL#$7$^$9!#(B +@code{ssl} $B$J$i!"(B@samp{!} $B$rIU$1$J$/$F$b(B SSL $B$r;H$$$^$9!#(B@code{starttls} +$B$J$i(B @samp{!!} $B$r0UL#$7$^$9!#(B + +@lisp +;; $BNc(B: SSL $B$rMxMQ$7$F%3%M%/%7%g%s$rD%$k(B +(setq elmo-default-imap4-stream-type 'ssl) +@end lisp (SSL $B$rMxMQ$9$k$K$O(B $BK\%Q%C%1!<%8$N(B @file{utils/ssl.el} $B$r%$%s%9%H!<%k$9(B $B$kI,MW$,$"$j$^$9!#$J$*$+$D!"(BOpenSSL$B$K4^$^$l$k(B @command{openssl} $B$K%Q%9$,(B @@ -806,6 +816,11 @@ non-nil $B$J$i!"(B@samp{!} $B$rIU$1$J$/$F$b(B SSL $B$r;H$$$^$9!#(B'starttl @code{elmo-imap4-force-login} $B$,(B non-nil $B$J$i$P!"3NG'L5$7$K(B @code{clear} $B$K@ZBX$($^$9(B($B=i4|@_Dj$O(B @code{nil})$B!#(B +@lisp +;; $BNc(B: $B@8%Q%9%o!<%I$GG'>Z(B +(setq elmo-default-imap4-authenticate-type 'clear) +@end lisp + $BNc(B: @example @@ -2514,7 +2529,6 @@ prefix argument $B$D$-$G(B @kbd{/} $B$r2!$9$H!"A4$F$N;R%9%l%C%I$r3+$-$^$9!#( @item wl-cache-prefetch-folder-type-list @vindex wl-cache-prefetch-folder-type-list $B=i4|@_Dj$O0J2<$N%j%9%H!#(B -The initial setting is the list shown below: @lisp @group (nntp imap4) @@ -4218,8 +4232,9 @@ Non-nil $B$J$iJV?.%"%I%l%9$N(B @samp{To:}, @samp{Cc:} $B%U%#!<%k%I$KAjl9g$O%-%c%C%7%e$5$l$^$;$s!#(B @item wl-auto-flush-queue @vindex wl-auto-flush-queue @@ -5784,8 +5799,6 @@ OK $B$G$9!#(B ;; @r{$B<+F0E*$K(B ML $B%U%#!<%k%I$r2C$($k(B} (add-hook 'bbdb-notice-hook 'bbdb-auto-notes-hook) (setq bbdb-auto-notes-alist '(("X-ML-Name" (".*$" ML 0)))) -;; @r{$B<+F0<}=8$9$k%U%)%k%@$N@55,I=8=(B} -(setq bbdb-wl-folder-regexp "^%\\|^-") @end group @end lisp diff --git a/doc/wl.texi b/doc/wl.texi index 0ce09ba..c6f233f 100644 --- a/doc/wl.texi +++ b/doc/wl.texi @@ -5,7 +5,7 @@ @c %**end of header @documentlanguage en @documentencoding us-ascii -@set VERSION 2.5.8 +@include version.texi @synindex pg cp @finalout @@ -762,12 +762,22 @@ You can omit the @var{hostname} from folder names if you set For example, you can specify a folder as @samp{foo%imap@@gateway} even if you have to go through a firewall. +@lisp +;; Example: imap4.exaple.org as main IMAP server +(setq elmo-default-imap4-server "imap4.example.org") +@end lisp + SSL (Secure Socket Layer) connection will be used if a folder name ends with @samp{!}. Or, if the value of @code{elmo-default-imap4-stream-type} -is non-nil, SSL will be the default connection. If a folder name ends -with @samp{!!}, STARTTLS connection will be established. If the value -of @code{elmo-default-imap4-stream-type} is @code{starttls}, STARTTLS -will be the default connection. +is @code{ssl}, SSL will be the default connection. If a folder name +ends with @samp{!!}, STARTTLS connection will be established. If the +value of @code{elmo-default-imap4-stream-type} is @code{starttls}, +STARTTLS will be the default connection. + +@lisp +;; Example: Use SSL connection +(setq elmo-default-imap4-stream-type 'ssl) +@end lisp If you specify @code{login}, @code{cram-md5} or @code{digest-md5} as authentication method, the password is sent in encoded form. But, if @@ -777,6 +787,11 @@ after confirmation to user. If @code{elmo-imap4-force-login} is non-nil, authentication will fall back to @code{clear} without confirmation (default value is @code{nil}). +@lisp +;; Example: password in raw format +(setq elmo-default-imap4-authenticate-type 'clear) +@end lisp + Example: @example @@ -4253,8 +4268,8 @@ sent off-line. @item wl-draft-use-cache @vindex wl-draft-use-cache -The initial setting is @code{t}. -If non-nil, cache the message which is sent. +The initial setting is @code{nil}. If the value is non-nil and +@code{wl-insert-message-id} is non-nil, cache the message which is sent. @item wl-auto-flush-queue @vindex wl-auto-flush-queue @@ -5850,8 +5865,6 @@ byte-compiled and installed. ;; @r{automatically add mailing list fields} (add-hook 'bbdb-notice-hook 'bbdb-auto-notes-hook) (setq bbdb-auto-notes-alist '(("X-ML-Name" (".*$" ML 0)))) -;; @r{folder regexp for auto collection} -(setq bbdb-wl-folder-regexp "^%\\|^-") @end group @end lisp -- 1.7.10.4