Merge branch 'master' of git://gitorious.org/lukeshu-dotfiles/lukeshu-dotfiles

Conflicts:
	.bashrc
	.profile

1 files changed, 45 insertions, 25 deletions

diff --git a/.wl b/.wl
index c6bf63c..63182f3 100644
--- a/.wl
+++ b/.wl
@@ -1,29 +1,33 @@
 ;; mode:-*-emacs-lisp-*-
 
-;; wanderlust 
-(setq 
-  elmo-maildir-folder-path "~/Maildir"          ;; where I store my mail
+(setq user-mail-address "lukeshu@sbcglobal.net")
 
-  wl-stay-folder-window t                       ;; show the folder pane (left)
-  wl-folder-window-width 35                     ;; toggle on/off with 'i'
-
-  wl-local-domain "lukeshu.ath.cx"
+;; wanderlust 
+(setq
+  ;; Misc ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+  wl-local-domain "lukeshu.ath.cx"  
+  wl-icon-directory "~/.emacs.d/el-get/wanderlust/icons"
   
+  ;; Network ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+  ;; This only deals with sending--I use offlineimap to fetch
   wl-draft-send-mail-function 'wl-draft-send-mail-with-smtp
-  wl-smtp-connection-type (quote ssl)
-  wl-smtp-authenticate-type "login"
-  wl-smtp-posting-server "plus.smtp.mail.yahoo.com"
-  wl-smtp-posting-port   465
-  wl-smtp-posting-user   "lukeshu@sbcglobal.net"
-  wl-message-id-domain   "lukeshu@sbcglobal.net"    ;; put a unique identifier here
-  wl-from "Luke Shumaker <lukeshu@sbcglobal.net>"   ;; my From:
+  ;; The following settings are Yahoo!'s SMTP servers:
+  wl-smtp-connection-type   (quote ssl)
+  wl-smtp-authenticate-type "login"                         
+  wl-smtp-posting-server    "plus.smtp.mail.yahoo.com"
+  wl-smtp-posting-port      465
+  wl-smtp-posting-user      user-mail-address
+  wl-message-id-domain      user-mail-address
 
-  wl-fcc-force-as-read t               ;; mark sent messages as read 
+  ;; Folders/File system ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+  elmo-msgdb-directory "~/.emacs.d/elmo"        ;; where elmo keeps all its stuff
+  elmo-cache-directory "~/.emacs.d/elmo-cache"  ;; where elmo keeps all its stuff
+  elmo-maildir-folder-path "~/Maildir"          ;; where I store my mail
 
   ;; note: all below are dirs (Maildirs) under elmo-maildir-folder-path 
   ;; the '.'-prefix is for marking them as maildirs
   wl-fcc            "..Sent"       ;; sent msgs go to the "sent"-folder
-  wl-default-folder "..Inbox"      ;; my main inbox 
+  wl-default-folder "..Ham"        ;; my main inbox 
   wl-draft-folder   "..Draft"      ;; store drafts in 'postponed'
   wl-trash-folder   "..Trash"      ;; put trash in 'trash'
   wl-spam-folder    "..Bulk Mail"  ;; put spam in 'Bulk Mail'
@@ -33,11 +37,26 @@
   ;wl-biff-check-folder-list '(".todo") ;; check every 180 seconds
                                        ;; (default: wl-biff-check-interval)
 
-  wl-folder-hierarchy-access-folders '(".*")
+  ;wl-folder-hierarchy-access-folders '("\.*")
+  wl-folder-hierarchy-access-folders '(
+    "^.\\([^/.]+[/.]\\)*[^/.]+\\(:\\|@\\|$\\)"
+    "^-[^.]*\\(:\\|@\\|$\\)"
+    "^@$"
+    "^'$")
+
+  ;; Writing
+  wl-from (concat user-full-name " <" user-mail-address ">") ;; From: line  
+  ;;wl-organization "Foo Corp"
+  wl-fcc-force-as-read t                        ;; mark sent messages as read
+  mime-edit-split-message nil                   ;; don't split long messages
 
-  ;; hide many fields from message buffers
-  wl-message-ignored-field-list '("^.*:")
-  wl-message-visible-field-list
+  ;; Reading ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+  wl-stay-folder-window t                       ;; show the folder pane (left)
+  wl-folder-window-width 35                     ;; 
+  wl-message-auto-reassemble-message/partial t  ;; reasemble split messages
+  
+  wl-message-ignored-field-list '("^.*:") ;; default to hiding all headers
+  wl-message-visible-field-list           ;; but then display these
   '("^\\(To\\|Cc\\):"
     "^Subject:"
     "^\\(From\\|Reply-To\\):"
@@ -45,11 +64,12 @@
     "^Message-Id:"
     "^\\(Posted\\|Date\\):"
     )
-  wl-message-sort-field-list
+  wl-message-sort-field-list              ;; in this order
   '("^From"
     "^Organization:"
     "^X-Attribution:"
-     "^Subject"
-     "^Date"
-     "^To"
-     "^Cc"))
+    "^Subject"
+    "^Date"
+    "^To"
+    "^Cc")
+  )