* wl-vars.el (wl-message-id-use-wl-from): New variable.

[elisp/wanderlust.git] / samples / en / dot.wl

diff --git a/samples/en/dot.wl b/samples/en/dot.wl
index 8d5681f..0cd00aa 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.)
@@ -55,6 +54,9 @@
 ;; Specific domain part for message-id.
 ;(setq wl-message-id-domain "hostname.example.com")
 
+;; Use wl-from for generating message-id.
+;; wl-message-id-use-wl-from precedes wl-local-domain and wl-message-id-domain.
+;(setq wl-message-id-use-wl-from t)
 
 ;;; [[ Server Setting ]]
 
@@ -151,7 +153,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)
@@ -213,15 +215,17 @@
          (setq subj (substring subject-string (match-end 0)))
          (if (not ml-name) (setq ml-name (match-string 1 subject-string)))
          (if (not ml-count) (setq ml-count (match-string 2 subject-string)))))
-    (if (and ml-name ml-count)
-       (if (string= folder wl-default-folder)
-           (format "(%s %05d) %s"
-                   (car (split-string ml-name " "))
-                   (string-to-int ml-count)
-                   subj)
-         (format "#%05d %s"
-                 (string-to-int ml-count) subj))
-      subj)))
+    (condition-case nil
+       (if (and ml-name ml-count)
+           (if (string= folder wl-default-folder)
+               (format "(%s %05d) %s"
+                       (car (split-string ml-name " "))
+                       (string-to-int ml-count)
+                       subj)
+             (format "#%05d %s"
+                     (string-to-int ml-count) subj))
+         subj)
+      (error subj))))
 
 ;; imput asynchronously.
 ;; (utils/im-wl.el is needed to be installed.
@@ -242,30 +246,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\\)"
-        wl-ml-draft-config-function            ;; function
-        ("From" . wl-from)                     ;; variable
-        ("Organization" . "~/.wl sample"))     ;; 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
@@ -353,7 +358,7 @@
 ;       ("^Wanderlust" . "+wl")
 ;       ("^Elisp" . "+elisp"))
 ;      ("From"
-;       ("teranisi@isl.ntt.co.jp" . "+teranisi"))))
+;       ("foo@example\\.com" . "+foo"))))
 
 ;; Marks to skip auto-refile (default is "N" "U" "!").
 ;; nil means all message is auto-refiled.