Merge branch 'master' into hp-dv6426us-par

3 files changed, 8 insertions, 1 deletions

diff --git a/.emacs b/.emacs
index 0637377..3cd2ea3 100644
--- a/.emacs
+++ b/.emacs
@@ -43,9 +43,10 @@
 (setq my-el-get-packages
       '(el-get
 ;        nxhtml
+        apel flim semi wanderlust
         smarttabs
         ))
-                            
+
 ;; Now load all of that ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ;; ELPA
diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
index ee82309..5a3e67f 100644
--- a/.emacs.d/custom.el
+++ b/.emacs.d/custom.el
@@ -9,6 +9,7 @@
  '(explicit-shell-file-name "/bin/bash")
  '(inhibit-startup-screen t)
  '(mdmua-maildir "~/Maildir")
+ '(minibuffer-prompt-properties (quote (read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt)))
  '(ruby-deep-arglist nil)
  '(ruby-deep-indent-paren nil)
  '(scroll-bar-mode nil))
diff --git a/.gitconfig b/.gitconfig
index 86f8b1e..9846d72 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,3 +3,8 @@
 	email = LukeShu@sbcglobal.net
 [color]
 	ui = auto
+[sendemail]
+	smtpencryption = ssl
+	smtpserver = plus.smtp.mail.yahoo.com
+	smtpuser = lukeshu@sbcglobal.net
+	smtpserverport = 465