Merge remote-tracking branch 'origin/master' into purdue-cs

Conflicts:
	.config/X11/clientrc
	.config/bash/rc.d/emacs.sh
	.config/bash/rc.sh
	.config/conkeror
	.config/conkerorrc
	.config/emacs/custom.el
	.config/irbrc
	.config/login.sh
	.config/maildirproc/att.rc
	.config/maildirproc/default.rc
	.config/offlineimaprc
	.config/ssh/config
	.config/wmii-hg/autostart
	.config/wmii-hg/include.sh
	.config/wmii-hg/quit
	.config/wmii-hg/rbar_battery
	.config/wmii-hg/rbar_clock
	.config/wmii-hg/rbar_cpu
	.config/wmii-hg/rbar_wifi
	.conkerorrc
	.maildirproc/default.rc

2 files changed, 138 insertions, 1 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 3cd2ea3..2a7645f 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -58,14 +58,45 @@
 
 ;; General settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+(require 'go-mode-load)
+
+(require 'mailcrypt)
+(mc-setversion "gpg")
+(add-hook 'wl-summary-mode-hook 'mc-install-read-mode)
+(add-hook 'wl-mail-setup-hook 'mc-install-write-mode)
+
+(defun mc-wl-verify-signature ()
+  (interactive)
+  (save-window-excursion
+    (wl-summary-jump-to-current-message)
+    (mc-verify)))
+
+(defun mc-wl-decrypt-message ()
+  (interactive)
+  (save-window-excursion
+    (wl-summary-jump-to-current-message)
+    (let ((inhibit-read-only t))
+      (mc-decrypt))))
+
+(eval-after-load "mailcrypt"
+  '(setq mc-modes-alist
+       (append
+        (quote
+         ((wl-draft-mode (encrypt . mc-encrypt-message)
+            (sign . mc-sign-message))
+          (wl-summary-mode (decrypt . mc-wl-decrypt-message)
+            (verify . mc-wl-verify-signature))))
+        mc-modes-alist)))
+
 ;(load "mdmua")
 (load "emacsutils")
 
+(set-default 'truncate-lines t)
 (tool-bar-mode -1)
 (ido-mode t)
 (show-paren-mode 1)
-(setq org-hide-leading-stars t)
 (setq org-log-done 'time)
+(setq gamegrid-user-score-file-directory "/var/games/emacs/")
 ;(xclip-mode 1)
 
 (load "whitespace")
@@ -170,6 +201,9 @@
              ))
 
 (add-to-list 'auto-mode-alist '("PKGBUILD" . sh-mode))
+(add-to-list 'auto-mode-alist '("SRCBUILD" . sh-mode))
+(add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
+(add-to-list 'auto-mode-alist '("\\.ronn\\'" . markdown-mode))
 
 ;(require 'flymake)
 ;(add-hook 'php-mode-hook (lambda() (flymake-mode 1)))
@@ -178,3 +212,29 @@
 
 ;(setq tramp-debug-buffer t) 
 ;(setq tramp-verbose 10)
+
+;; (add-to-list 'load-path "/usr/share/emacs/site-lisp/mu4e")
+;; (require 'mu4e)
+;; (require 'mu4e-speedbar)
+
+;; (setq
+;;  mu4e-maildir       "~/Maildir"   ;; top-level Maildir
+;;  mu4e-sent-folder   "/.Sent"       ;; folder for sent messages
+;;  mu4e-drafts-folder "/.Draft"     ;; unfinished messages
+;;  mu4e-trash-folder  "/.Trash"      ;; trashed messages
+;;  mu4e-refile-folder "/archive")   ;; saved messages
+;; (setq mu4e-get-mail-command "offlineimap")
+;; (setq mu4e-use-fancy-chars "t")
+;; ;; enable inline images
+;; (setq mu4e-view-show-images t)
+;; ;; use imagemagick, if available
+;; (when (fboundp 'imagemagick-register-types)
+;;   (imagemagick-register-types))
+
+
+(defun sm-try-smerge ()
+  (save-excursion
+    (goto-char (point-min))
+    (when (re-search-forward "^<<<<<<< " nil t)
+      (smerge-mode 1))))
+(add-hook 'find-file-hook 'sm-try-smerge t)
diff --git a/.config/emacs/wl.el b/.config/emacs/wl.el
new file mode 100644
index 0000000..a169249
--- /dev/null
+++ b/.config/emacs/wl.el
@@ -0,0 +1,77 @@
+;; mode:-*-emacs-lisp-*-
+
+(setq user-mail-address "lukeshu@sbcglobal.net")
+
+;; 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
+  ;; 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-server    "outbound.att.net"
+  wl-smtp-posting-port      465
+  wl-smtp-posting-user      user-mail-address
+  wl-message-id-domain      user-mail-address
+
+  ;; 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 "..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'
+  wl-queue-folder   "..queue"      ;; we don't use this
+
+  ;; check this folder periodically, and update modeline
+  ;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 '(
+    "^.\\([^/.]+[/.]\\)*[^/.]+\\(:\\|@\\|$\\)"
+    "^-[^.]*\\(:\\|@\\|$\\)"
+    "^@$"
+    "^'$")
+
+  ;; 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
+
+  ;; 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\\):"
+    "^Organization:"
+    "^Message-Id:"
+    "^\\(Posted\\|Date\\):"
+    "^List-ID:"
+    )
+  wl-message-sort-field-list              ;; in this order
+  '("^Date"
+    "^From"
+    "^Organization:"
+    "^X-Attribution:"
+    "^Subject"
+    "^To"
+    "^Cc")
+  )