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

3 files changed, 7 insertions, 8 deletions

diff --git a/.config/herbstluftwm/panel.sh b/.config/herbstluftwm/panel.sh
index 54d8479..be8b3f6 100755
--- a/.config/herbstluftwm/panel.sh
+++ b/.config/herbstluftwm/panel.sh
@@ -64,7 +64,9 @@ function print_tags() {
 }
 
 function print_mailboxes() {
+    declare -A mailnames
     mailboxes=(ninthfloor gmail arch aethon ryuslash.org)
+    mailnames=([ninthfloor]="9f" [gmail]="gm" [arch]="arc" [aethon]="aet" [ryuslash.org]="ryu")
     mailtxt=""
     for j in "${mailboxes[@]}"; do
         mailfile="$HOME/documents/mail/$j/INBOX/new/"
@@ -77,7 +79,7 @@ function print_mailboxes() {
             mailcolor=$bgcolor
         fi
 
-        mailtxt="$mailtxt${separator}^bg($mailcolor)^fg(#ffffff) $j ^fg()^bg()"
+        mailtxt="$mailtxt${separator}^bg($mailcolor)^fg(#ffffff) ${mailnames[$j]} ^fg()^bg()"
 #        echo -n "^fg($mailcolor)^ro(${tag_width}x$height)^fg()$separator"
     done
     mailtxt_only=$(echo -n "$mailtxt" | sed 's.\^[^(]*([^)]*)..g')
diff --git a/.xbindkeysrc.scm b/.xbindkeysrc.scm
index bf5a77d..a58c09a 100644
--- a/.xbindkeysrc.scm
+++ b/.xbindkeysrc.scm
@@ -27,10 +27,8 @@
     (close-port file)
     tags))
 
-(define (get-tag tags pipe)
-  (read-line pipe))
-
 (define (choose-tag prompt tags)
+  "Ask to choose a tag"
   (let* ((file (open-input-pipe
                 (string-append "echo '" (string-join tags "\n")
                                "' | " dmenu-cmd " -p '" prompt ":'")))
@@ -45,7 +43,7 @@
     (if (string? tag)
         (begin
           (if (not (member tag tags))
-              (run-command (string-append "herbstclient add " tag)))
+              (system (string-append "herbstclient add " tag)))
           (run-command (string-append "herbstclient use " tag))))
     (reset-main-binding)))
 
@@ -66,7 +64,7 @@
     (if (string? tag)
         (begin
           (if (not (member tag tags))
-              (run-command (string-append "herbstclient add " tag)))
+              (system (string-append "herbstclient add " tag)))
           (run-command (string-append "herbstclient move " tag))))
     (reset-main-binding)))
 
diff --git a/.xinitrc b/.xinitrc
index a7956b8..0d1c74e 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,5 +1,4 @@
-case
-        # -*- mode: shell-script; eval: (git-auto-commit-mode 1) -*-
+# -*- mode: shell-script; eval: (git-auto-commit-mode 1) -*-
 
 # -----[ Set background ]---------------------------------------------
 hsetroot -center ~/pictures/wallpapers/3600x1080/wallpaper-1460625.jpg