diff options
| author |  Tom Willemsen | 2012-10-24 01:36:38 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2012-10-24 01:36:38 +0200 |
| commit | d6be1ae80fb59495c6bb72b5b6248b5c9a08b4c7 (patch) | |
| tree | 71f06d73cb4139e6a8c8aff91e229a9ff4d58b35 /.xinitrc | |
| parent | ab3e4c680e329db4c01e6d029874124011328ba1 (diff) | |
| parent | 31d3b87a976a229f444251b871c32dd914330044 (diff) | |
| download | dotfiles-d6be1ae80fb59495c6bb72b5b6248b5c9a08b4c7.tar.gz dotfiles-d6be1ae80fb59495c6bb72b5b6248b5c9a08b4c7.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/site-lisp/oni.el
.xinitrc
.zprofile
Diffstat (limited to '.xinitrc')
| -rwxr-xr-x | .xinitrc | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -9,13 +9,11 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then unset f fi -emacs --daemon & - pidof mpdscribble >& /dev/null if [ $? -ne 0 ] then mpdscribble & fi -test -n "$1" && wm=$1 || wm="awesome" # wm="emacsclient -ce \"(oni:wm-init)\"" +test -n "$1" && wm=$1 || wm="emacs" exec $wm |