Merge branch 'thinkpenguin-par' of /home/luke/. into thinkpenguin-par

2 files changed, 13 insertions, 10 deletions

diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el
index b6a84a2..47bf654 100644
--- a/.config/emacs/custom.el
+++ b/.config/emacs/custom.el
@@ -27,7 +27,9 @@
  '(smtpmail-smtp-service 587)
  '(vc-annotate-background "#2b2b2b")
  '(vc-annotate-color-map (quote ((20 . "#bc8383") (40 . "#cc9393") (60 . "#dfaf8f") (80 . "#d0bf8f") (100 . "#e0cf9f") (120 . "#f0dfaf") (140 . "#5f7f5f") (160 . "#7f9f7f") (180 . "#8fb28f") (200 . "#9fc59f") (220 . "#afd8af") (240 . "#bfebbf") (260 . "#93e0e3") (280 . "#6ca0a3") (300 . "#7cb8bb") (320 . "#8cd0d3") (340 . "#94bff3") (360 . "#dc8cc3"))))
- '(vc-annotate-very-old-color "#dc8cc3"))
+ '(vc-annotate-very-old-color "#dc8cc3")
+ '(wl-init-file "~/.emacs.d/wl.el")
+ '(wl-score-files-directory "~/.emacs.d/elmo"))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/.wl b/.config/emacs/wl.el
index f28f6ed..a169249 100644
--- a/.wl
+++ b/.config/emacs/wl.el
@@ -2,19 +2,20 @@
 
 (setq user-mail-address "lukeshu@sbcglobal.net")
 
-;; wanderlust 
+;; wanderlust
 (setq
   ;; Misc ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  wl-local-domain "lukeshu.ath.cx"  
+  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
   ;; The following settings are Yahoo!'s SMTP servers:
   wl-smtp-connection-type   (quote ssl)
-  wl-smtp-authenticate-type "login"                         
+  wl-smtp-authenticate-type "login"
   wl-smtp-posting-server    "plus.smtp.mail.yahoo.com"
+  ;wl-smtp-posting-server    "outbound.att.net"
   wl-smtp-posting-port      465
   wl-smtp-posting-user      user-mail-address
   wl-message-id-domain      user-mail-address
@@ -24,10 +25,10 @@
   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 
+  ;; 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 "..Ham"        ;; 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'
@@ -45,16 +46,16 @@
     "^'$")
 
   ;; Writing
-  wl-from (concat user-full-name " <" user-mail-address ">") ;; From: line  
+  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
 
   ;; Reading ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
   wl-stay-folder-window t                       ;; show the folder pane (left)
-  wl-folder-window-width 35                     ;; 
+  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\\):"