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

.Xdefaults

@@ -47,8 +47,8 @@ urxvt*urlLauncher:     firefox
 urxvt*matcher.button:  1
 
 ! Appearance
-urxvt.font:        -misc-tamsyn-medium-r-normal-*-17-*-*-*-*-*-iso8859-*
-urxvt.boldFont:    -misc-tamsyn-bold-r-normal-*-17-*-*-*-*-*-iso8859-*
+urxvt.font: xft:DejaVu Sans Mono:weight=medium:pixelsize=13
+urxvt.boldFont: xft:DejaVu Sans Mono:weight=black:pixelsize=13
 urxvt.transparent: true
 
 xterm*faceName: -misc-tamsyn-medium-r-normal-*-17-*-*-*-*-*-iso8859-*

.config/herbstluftwm/panel.sh

@@ -9,9 +9,9 @@ if [ -z "$geometry" ] ;then
 fi
 # geometry has the format: WxH+X+Y
 x=${geometry[0]}
-y=${geometry[1]}
 width=${geometry[2]}
 height=1
+y=$(expr ${geometry[3]} - $height)
 tag_width=40
 font="-misc-tamsyn-medium-r-normal-*-14-*-*-*-*-*-iso8859-*"
 
@@ -25,7 +25,7 @@ function uniq_linebuffered() {
     awk '$0 != l { print ; l=$0 ; fflush(); }' "$@"
 }
 
-herbstclient pad $monitor $(expr $height - 4) -5 -5 -5
+herbstclient pad $monitor -5 -5 $(expr -5 + $height) -5
 herbstclient pad $monitor2 -5 -5 -5 -5
 {
     childpid=$!

.config/newsbeuter/urls

@@ -1,4 +1,4 @@
-# -*- mode: conf; mode: outline-minor -*-
+# -*- mode: conf; eval: (git-auto-commit-mode 1) -*-
 
 #-----[ Followed projects ]-------------------------------------------
 https://github.com/ryuslash.private.atom?token=7362ca0604736cd92b5441949e8c9cd4
@@ -74,6 +74,7 @@ http://www.reddit.com/r/emacs/.rss emacs
 http://planet.emacsen.org/atom.xml emacs
 http://emacsblog.org/feed/ emacs
 http://www.emacswiki.org/emacs?action=rss emacs
+http://feeds.feedburner.com/XahsEmacsBlog
 
 #-----[ N900 ]--------------------------------------------------------
 http://www.reddit.com/r/n900/.rss n900

.xbindkeysrc.scm

@@ -1,3 +1,4 @@
+;; -*- eval: (git-auto-commit-mode 1) -*-
 ;;; Modkey
 (define modkey 'mod4)
 
@@ -52,6 +53,7 @@
   (xbindkey-function '(shift f) (cmd "herbstclient fullscreen toggle"))
   (xbindkey-function '(p) (cmd "herbstclient pseudotile toggle"))
   (xbindkey-function '(r) resize-map)
+  (xbindkey-function '(m) (cmd "~/bin/move_to_tag"))
   (xbindkey-function `(,modkey g) reset-main-binding)
   (grab-all-keys))
 

ChangeLog

@@ -1,6 +0,0 @@
-2011-12-03  Tom Willemsen  <tom@ryuslash.org>
-
-	* .Xdefaults: Changed `*.color2' from #5a8e3a to #337733,
-	`*.color10' from #80b080 to #5ec95e, `*.color3' from #c9c990 to
-	#eac435, `*.color4' from RoyalBlue to #295874, `*.color12' from
-	#90a4c8 to RoyalBlue and `*.color13' from #ad68a6 to #9b859d

bin/move_to_tag

@@ -0,0 +1,9 @@
+#!/bin/zsh
+
+. $HOME/bin/hlwm_source
+
+if [[ "${TAGS[@]}" != *" $FOO "* ]]; then
+    herbstclient add $FOO
+fi
+
+herbstclient move $FOO