diff options
| author |  Tom Willemsen | 2013-02-15 15:37:42 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2013-02-15 15:37:42 +0100 |
| commit | 934d02bcacaa5d0aef64a8edf7677f3b0c198666 (patch) | |
| tree | edfc842025b5f8569973567b44ad62aa662f548f /.emacs.d/site-lisp/dzen.el | |
| parent | 06ff316f7f3b098504a6342651a79017cfb80ae7 (diff) | |
| parent | ee34dfcc2c2fec53731b64afca03bb34dd80b2ba (diff) | |
| download | dotfiles-934d02bcacaa5d0aef64a8edf7677f3b0c198666.tar.gz dotfiles-934d02bcacaa5d0aef64a8edf7677f3b0c198666.zip | |
Merge remote-tracking branch 'ryuslash/master' into phoenix
Conflicts:
.config/awesome/rc.lua
.emacs.d/init.el
.emacs.d/init.org
.emacs.d/site-lisp/oni.el
Diffstat (limited to '.emacs.d/site-lisp/dzen.el')
| -rw-r--r-- | .emacs.d/site-lisp/dzen.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.emacs.d/site-lisp/dzen.el b/.emacs.d/site-lisp/dzen.el index 2d43f95..6cc3eae 100644 --- a/.emacs.d/site-lisp/dzen.el +++ b/.emacs.d/site-lisp/dzen.el @@ -39,7 +39,9 @@ (defun dzen-update () (let ((strl "") - (strc metal-express-radio-currently-playing) + (strc (if (boundp 'metal-express-radio-currently-playing) + metal-express-radio-currently-playing + "")) (strr (format "jabber: %s ryu: %d gm: %d aet: %d 9n: %d rss: %d\n" (oni:current-jabber-status) |