Synch with wl-2_8.

diff --git a/samples/en/dot.wl b/samples/en/dot.wl
index 76736e9..1fbf9c4 100644 (file)
--- a/samples/en/dot.wl
+++ b/samples/en/dot.wl
@@ -3,10 +3,9 @@
 ;; [[ Requirement Setting ]]
 
 ;; Following must be included in ~/.emacs
-;; for .emacs begin
+;; (No need if installed as XEmacs package.)
 (autoload 'wl "wl" "Wanderlust" t)
 (autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t)
-;; for .emacs end
 
 ;; Icon directory
 ;; (No need if installed as XEmacs package.)
@@ -151,7 +150,7 @@
 ;(setq elmo-pop3-use-cache t)
 
 ;; Enable disconnected operation in IMAP folder.
-;(setq elmo-enable-disconnected-operation t)
+(setq elmo-enable-disconnected-operation t)
 
 ;; Store draft message in queue folder if message is sent in unplugged status.
 (setq wl-draft-enable-queuing t)
@@ -244,30 +243,31 @@
 ;;; [[ Template ]]
 
 ;; template
-(setq wl-template-alist
-      '(("default"
-        ("From" . wl-from)
-        ("Organization" . "~/.wl sample")
-        (body . "Hello, this is XXX \n"))              ;; body
-       ("report"
-        ("To" . "boss@example.com")
-        ("Subject" . "Report")
-        (top . "Sir, here is my report\n")             ;; insert in top.
-;;      (bottom-file . "~/work/report.txt")    ;; insert file in bottom
-        )
-       ))
+;(setq wl-template-alist
+;      '(("default"
+;       ("From" . wl-from)
+;       ("Organization" . "organization for default")
+;       (body . "Hello, this is XXX \n")) ; body
+;      ("report"
+;       ("To" . "boss@example.com")
+;       ("Subject" . "Report")
+;       (top . "Sir, here is my report\n") ; insert in top.
+;       (bottom-file . "~/work/report.txt") ; insert file in bottom
+;       )
+;      ))
+
 ;; Change headers in draft sending time.
-(setq wl-draft-config-alist
-      '((reply                         ; see reply buffer
-        "^To: .*test-notsend-wl@lists\\.airs\\.net"
-        (template . "default"))        ; template
-       ("^To: .*test-notsend-wl@lists\\.airs\\.net"
-        ding                           ; function
-        ("From" . wl-from)             ; variable
-        ("Organization" . "CHANGE THIS!!")) ; string
-       ("^Newsgroups: test.*"
-        ("Organization" . "organization for nntp."))
-       ))
+;(setq wl-draft-config-alist
+;      '((reply                                ; see reply buffer
+;       "^To: .*test-notsend-wl@lists\\.airs\\.net"
+;       (template . "default"))        ; template
+;      ("^To: .*test-notsend-wl@lists\\.airs\\.net"
+;       ding                           ; function
+;       ("From" . wl-from)             ; variable
+;       ("Organization" . "organization")) ; string
+;      ("^Newsgroups: test.*"
+;       ("Organization" . "organization for nntp."))
+;      ))
 
 ;; Change headers in draft preparation time.
 ;(add-hook 'wl-mail-setup-hook

diff --git a/samples/ja/dot.wl b/samples/ja/dot.wl
index df914da..87c9b65 100644 (file)
--- a/samples/ja/dot.wl
+++ b/samples/ja/dot.wl
@@ -3,10 +3,9 @@
 ;; [[ \e$BF0:n$KI,MW$J@_Dj\e(B ]]
 
 ;; \e$B$^$:!"<!$N@_Dj$r\e(B ~/.emacs \e$B$J$I$K=q$$$F$/$@$5$$!#\e(B
-;; \e$B$3$3$+$i\e(B
+;; XEmacs \e$B$N\e(B package \e$B$H$7$F%$%s%9%H!<%k$5$l$F$$$k>l9g$OI,MW$"$j$^$;$s!#\e(B
 (autoload 'wl "wl" "Wanderlust" t)
 (autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t)
-;; \e$B$3$3$^$G\e(B
 
 ;; \e$B%"%$%3%s$rCV$/%G%#%l%/%H%j\e(B
 ;; XEmacs \e$B$N\e(B package \e$B$H$7$F%$%s%9%H!<%k$5$l$F$$$k>l9g$OI,MW$"$j$^$;$s!#\e(B
@@ -150,7 +149,7 @@
 ;(setq elmo-pop3-use-cache t)
 
 ;; \e$B%*%U%i%$%s\e(B(unplugged)\e$BA`:n$rM-8z$K$9$k\e(B(\e$B8=:_$O\e(BIMAP\e$B%U%)%k%@$N$_\e(B)
-;(setq elmo-enable-disconnected-operation t)
+(setq elmo-enable-disconnected-operation t)
 
 ;; unplugged \e$B>uBV$GAw?.$9$k$H!$%-%e!<\e(B(`wl-queue-folder')\e$B$K3JG<$9$k\e(B
 (setq wl-draft-enable-queuing t)
@@ -243,32 +242,32 @@
 ;;; [[ \e$B%F%s%W%l!<%H\e(B ]]
 
 ;; \e$B%F%s%W%l!<%H$N@_Dj\e(B
-(setq wl-template-alist
-      '(("default"
-        ("From" . wl-from)
-        ("Organization" . "~/.wl sample")
-        (body . "  \e$B!{!{$G$9!#\e(B\n"))       ; \e$BK\J8\e(B
-       ("report"
-        ("To" . "boss@example.com")
-        ("Subject" . "\e$BJs9p\e(B")
-        (top . "\e$B:#=5$NJs9p$G$9!#\e(B\n")     ; \e$BK\J8@hF,$X$NA^F~\e(B
-;;      (bottom-file . "~/work/report.txt") ; \e$BK\J8KvHx$X%U%!%$%k$NA^F~\e(B
-        )
-       ))
+;(setq wl-template-alist
+;      '(("default"
+;       ("From" . wl-from)
+;       ("Organization" . "\e$B%G%U%)%k%H$NAH?%L>\e(B")
+;       (body . "  \e$B!{!{$G$9!#\e(B\n"))       ; \e$BK\J8\e(B
+;      ("report"
+;       ("To" . "boss@example.com")
+;       ("Subject" . "\e$BJs9p\e(B")
+;       (top . "\e$B:#=5$NJs9p$G$9!#\e(B\n")     ; \e$BK\J8@hF,$X$NA^F~\e(B
+;       (bottom-file . "~/work/report.txt") ; \e$BK\J8KvHx$X%U%!%$%k$NA^F~\e(B
+;       )
+;      ))
 
 ;; \e$B%I%i%U%H%P%C%U%!$NFbMF$K$h$j\e(B From \e$B$d\e(B Organization \e$B$J$I$N%X%C%@$r<+\e(B
 ;; \e$BF0E*$KJQ99$9$k\e(B
-(setq wl-draft-config-alist
-      '((reply                         ; \e$BJV?.85$N%P%C%U%!$r8+$k\e(B
-        "^To: .*test-notsend-wl@lists\\.airs\\.net"
-        (template . "default"))        ; \e$B%F%s%W%l!<%H\e(B
-       ("^To: .*test-notsend-wl@lists\\.airs\\.net"
-        ding                           ; \e$B4X?t\e(B
-        ("From" . wl-from)             ; \e$BJQ?t\e(B
-        ("Organization" . "CHANGE THIS!!")) ; \e$BJ8;zNs\e(B
-       ("^Newsgroups: test.*"
-        ("Organization" . "\e$B%K%e!<%9Ej9F;~$NAH?%L>\e(B"))
-       ))
+;(setq wl-draft-config-alist
+;      '((reply                                ; \e$BJV?.85$N%P%C%U%!$r8+$k\e(B
+;       "^To: .*test-notsend-wl@lists\\.airs\\.net"
+;       (template . "default"))        ; \e$B%F%s%W%l!<%H\e(B
+;      ("^To: .*test-notsend-wl@lists\\.airs\\.net"
+;       ding                           ; \e$B4X?t\e(B
+;       ("From" . wl-from)             ; \e$BJQ?t\e(B
+;       ("Organization" . "\e$BAH?%L>\e(B"))     ; \e$BJ8;zNs\e(B
+;      ("^Newsgroups: test.*"
+;       ("Organization" . "\e$B%K%e!<%9Ej9F;~$NAH?%L>\e(B"))
+;      ))
 
 ;; \e$B%I%i%U%H:n@.;~\e(B(\e$BJV?.;~\e(B)\e$B$K!$<+F0E*$K%X%C%@$rJQ99$9$k\e(B
 ;(add-hook 'wl-mail-setup-hook