diff options
author | Tom Willemsen | 2012-10-26 01:46:09 +0200 |
---|---|---|
committer | Tom Willemsen | 2012-10-26 01:46:09 +0200 |
commit | cbdfa4cac317cbde73da1bbbc4bae37c6617f5d9 (patch) | |
tree | 5c0040ca1c8e8ea10f0c8b4d647d579d72c4bc18 /.emacs.d/site-lisp | |
parent | d6be1ae80fb59495c6bb72b5b6248b5c9a08b4c7 (diff) | |
parent | 2e70340b951f485d45b95684e7910d1a78917d03 (diff) | |
download | dotfiles-cbdfa4cac317cbde73da1bbbc4bae37c6617f5d9.tar.gz dotfiles-cbdfa4cac317cbde73da1bbbc4bae37c6617f5d9.zip |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/site-lisp/oni.el
Diffstat (limited to '.emacs.d/site-lisp')
-rw-r--r-- | .emacs.d/site-lisp/metalexpress.el | 49 | ||||
-rw-r--r-- | .emacs.d/site-lisp/oni.el | 4 | ||||
-rw-r--r-- | .emacs.d/site-lisp/wm-init.el | 2 |
3 files changed, 53 insertions, 2 deletions
diff --git a/.emacs.d/site-lisp/metalexpress.el b/.emacs.d/site-lisp/metalexpress.el new file mode 100644 index 0000000..9d57c19 --- /dev/null +++ b/.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 diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index 35e85dc..9b02dc1 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.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'." diff --git a/.emacs.d/site-lisp/wm-init.el b/.emacs.d/site-lisp/wm-init.el index 1ff0501..694acab 100644 --- a/.emacs.d/site-lisp/wm-init.el +++ b/.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") |