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

Conflicts:
	.emacs.d/site-lisp/oni.el

.emacs.d/init.el

@@ -144,6 +144,18 @@
       `((".*" . ,temporary-file-directory)))
 (setq browse-url-browser-function 'browse-url-generic)
 (setq browse-url-generic-program (getenv "BROWSER"))
+(setq c-offsets-alist '((statement-block-intro . +)
+   (knr-argdecl-intro . 5)
+   (substatement-open . +)
+   (substatement-label . 0)
+   (label . 0)
+   (statement-case-open . +)
+   (statement-cont . +)
+   (arglist-intro . +)
+   (arglist-close . 0)
+   (inline-open . 0)
+   (brace-list-open . +)
+   (topmost-intro-cont first c-lineup-topmost-intro-cont c-lineup-gnu-DEFUN-intro-cont)))
 (setq comment-auto-fill-only-comments t)
 (setq custom-file "~/.emacs.d/custom.el")
 (setq custom-theme-directory "~/.emacs.d/themes")
@@ -184,6 +196,8 @@
            "whitespace before ':'"
            "whitespace after '('"
            "whitespace before ')'"
+           "whitespace after '['"
+           "whitespace before ']'"
            "the backslash is redundant between brackets"
            "continuation line over-indented for visual indent"
            "continuation line under-indented for visual indent"

.emacs.d/site-lisp/metalexpress.el

@@ -0,0 +1,49 @@
+;;; metalexpress.el --- Listen to Metal Express Radio
+
+;; Copyright (C) 2012  Tom Willemsen
+
+;; Author: Tom Willemsen <thomas@aethon.nl>
+;; Keywords: multimedia
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; Functions for easily listening to Metal Express Radio.
+
+;;; Code:
+
+(defgroup metal-express-radio nil
+  "Group for the Metal Express Radio listening functions."
+  :group 'multimedia)
+
+(defcustom metal-express-radio-playlist-url
+  "http://usa7-vn.mixstream.net/listen/8248.m3u"
+  "The URL of the Metal Express Radio stream.")
+
+;;;###autoload
+(defun metal-express-radio-start ()
+  "Start listening to Metal Express Radio."
+  (interactive)
+  (async-shell-command
+   (concat "mplayer " metal-express-radio-playlist-url)
+   "*Metal Express Radio*"))
+
+(defun metal-express-radio-stop ()
+  "Stop listening to Metal Express Radio."
+  (interactive)
+  (kill-process (get-buffer-process "*Metal Express Radio*")))
+
+(provide 'metalexpress)
+;;; metalexpress.el ends here

.emacs.d/site-lisp/oni.el

@@ -379,7 +379,9 @@ When dealing with braces, add another line and indent that too."
 
 (defun oni:org-mode-func ()
   "Function for `org-mode-hook'."
-  (auto-fill-mode))
+  (auto-fill-mode)
+  (yas-minor-mode)
+  (setq-local comment-auto-fill-only-comments nil))
 
 (defun oni:php-mode-func ()
   "Function for `php-mode-hook'."

.emacs.d/site-lisp/wm-init.el

@@ -1,3 +1,3 @@
 (async-shell-command "herbstluftwm" " herbstluftwm")
 (async-shell-command "dunst" " dunst")
-(async-shell-command "xbindkeys -n" " xbindkeys")
+(async-shell-command "xbindkeys" " xbindkeys")