Merge remote-tracking branch 'origin/master' into phoenix

Conflicts:
	.config/awesome/rc.lua

1 files changed, 23 insertions, 5 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 75c52e7..faf5ff5 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -245,6 +245,7 @@ DOT are intentionally being skipped."
 
 (defun oni:html-mode-func ()
   "Function for `html-mode-hook'."
+  (yas-minor-mode)
   (fci-mode))
 
 (defun oni:indent-shift-left (start end &optional count)
@@ -420,6 +421,10 @@ code.  Found at http://xahlee.org/emacs/elisp_parse_time.html"
             (end-of-line)))
       (end-of-line))))
 
+;; (defun oni:mu4e-view-mode-func ()
+;;   "Function for `mu4e-view-mode-hook'."
+;;   (longlines-mode))
+
 (defun oni:myepisodes-formatter (plist)
   "Format RSS items from MyEpisodes as org tasks.
 PLIST contains all the pertinent information."
@@ -449,7 +454,8 @@ When dealing with braces, add another line and indent that too."
 (defun oni:org-mode-func ()
   "Function for `org-mode-hook'."
   (flyspell-mode)
-  (auto-fill-mode))
+  (auto-fill-mode)
+  (yas-minor-mode))
 
 (defun oni:php-mode-func ()
   "Function for `php-mode-hook'."
@@ -809,6 +815,9 @@ for easy selection."
 (setq eshell-prompt-regexp "^[#$]> ")
 (setq fci-rule-color "darkred")
 (setq flymake-gui-warnings-enabled nil)
+(setq flymake-info-line-regexp
+      (eval-when-compile
+        (regexp-opt '("Invalid name"))))
 (setq flymake-log-file-name (expand-file-name "~/.emacs.d/flymake.log"))
 (setq flymake-log-level 0)
 (setq flymake-warn-line-regexp
@@ -816,7 +825,9 @@ for easy selection."
         (regexp-opt '("warning"
                       "Warning"
                       "Missing docstring"
-                      "String statement has no effect"))))
+                      "String statement has no effect"
+                      "No value passed for parameter"
+                      "imported but unused"))))
 (setq frame-title-format '(:eval (concat "emacs: " (buffer-name))))
 (setq geiser-repl-history-filename "~/.emacs.d/geiser-history")
 (setq gtags-auto-update t)
@@ -845,6 +856,7 @@ for easy selection."
 (setq mail-header-separator "")
 (setq message-log-max 1000)
 (setq message-send-mail-function 'message-send-mail-with-sendmail)
+(setq mode-line-position nil)
 (setq mu4e-headers-date-format "%d-%m %H:%M")
 (setq mu4e-headers-fields '((:date . 11)
                             (:flags . 6)
@@ -899,7 +911,7 @@ for easy selection."
 (setq org-feed-alist
       '(("MyEpisodes"
          "http://www.myepisodes.com/rss.php?feed=mylist&uid=Slash&pwdmd5=04028968e1f0b7ee678b748a4320ac17"
-         "~/documents/org/org" "MyEpisodes"
+         "~/documents/org/tasks" "MyEpisodes"
          :formatter oni:myepisodes-formatter)))
 (setq org-hide-emphasis-markers t)
 (setq org-outline-path-complete-in-steps t)
@@ -928,6 +940,7 @@ for easy selection."
         ("marmalade" . "http://marmalade-repo.org/packages/")))
 (setq package-load-list '((htmlize "1.39")
                           (lua-mode "20111107")
+                          (python "0.24.2")
                           all))
 (setq php-function-call-face 'font-lock-function-name-face)
 (setq php-mode-force-pear t)
@@ -982,6 +995,7 @@ for easy selection."
 (add-hook 'magit-log-edit-mode-hook 'oni:magit-log-edit-mode-func)
 (add-hook 'markdown-mode-hook 'oni:markdown-mode-func)
 (add-hook 'message-mode-hook 'oni:message-mode-func)
+;; (add-hook 'mu4e-view-mode-hook 'oni:mu4e-view-mode-func)
 (add-hook 'org-mode-hook 'oni:org-mode-func)
 (add-hook 'php-mode-hook 'oni:php-mode-func)
 (add-hook 'prog-mode-hook 'oni:prog-mode-func)
@@ -1034,7 +1048,7 @@ for easy selection."
 
 (add-to-list 'auto-mode-alist '("\\.jl$" . sawfish-mode))
 (add-to-list 'auto-mode-alist '("\\.js\\(on\\)?$" . js2-mode))
-(add-to-list 'auto-mode-alist '("\\.m\\(ark\\)?do?wn$" . markdown-mode))
+(add-to-list 'auto-mode-alist '("\\.m\\(ark\\)?d\\(?:o?wn\\)?$" . markdown-mode))
 (add-to-list 'auto-mode-alist '("\\.php[345]?$" . php-mode))
 (add-to-list 'auto-mode-alist '("\\.po\\'\\|\\.po\\." . po-mode))
 (add-to-list 'auto-mode-alist '("\\.tpl$" . html-mode))
@@ -1051,6 +1065,9 @@ for easy selection."
 (add-to-list 'display-buffer-alist
              '("^\\*.*\\*$" . ((bw-display-in-bottom-window . nil))))
 
+(delete "   " mode-line-format)
+(delete "  " mode-line-format)
+
 (unless (oni:required-packages-installed-p)
   (message "%s" "Refreshing package database...")
   (package-refresh-contents)
@@ -1065,9 +1082,10 @@ for easy selection."
 (scroll-bar-mode -1)
 (tool-bar-mode -1)
 (tooltip-mode -1)
+(line-number-mode -1)
+(column-number-mode -1)
 
 (auto-insert-mode)
-(column-number-mode)
 (electric-indent-mode)
 (electric-pair-mode)
 (ido-mode)