From fa4beb5aa8e2f4a9545444ff5a725ba8976447bc Mon Sep 17 00:00:00 2001
From: Kris Maglione <kris@suckless.org>
Date: Thu, 10 Jun 2010 19:49:17 -0400
Subject: [PATCH] Fix /rules in wmiirc and p9p/wmiirc.

---
 alternative_wmiircs/plan9port/wmiirc |  2 +-
 cmd/wmii/client.c                    |  2 +-
 rc/wmiirc.sh                         | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/alternative_wmiircs/plan9port/wmiirc b/alternative_wmiircs/plan9port/wmiirc
index 5f105f95..58010597 100755
--- a/alternative_wmiircs/plan9port/wmiirc
+++ b/alternative_wmiircs/plan9port/wmiirc
@@ -48,7 +48,7 @@ wmiir write /colrules <<!
 # Tagging Rules
 wmiir write /rules <<!
     # MPlayer and VLC don't float by default, but should.
-    /MPlayer|VLC/ floating=True
+    /MPlayer|VLC/ floating=on
     # ROX puts all of its windows in the same group, so they open
     # with the same tags.  Disable grouping for ROX Filer.
     /^ROX-Filer:/ group=0
diff --git a/cmd/wmii/client.c b/cmd/wmii/client.c
index 784a02a0..bc0ea956 100644
--- a/cmd/wmii/client.c
+++ b/cmd/wmii/client.c
@@ -1124,7 +1124,7 @@ client_applytags(Client *c, const char *tags) {
 		if(!isspace(tags[n]))
 			break;
 
-	if(tags[n] == '+' || tags[n] == '-')
+	if(tags[n] == '+' || tags[n] == '-' || tags[n] == '\0')
 		utflcpy(buf, c->tags, sizeof c->tags);
 	else {
 		refree(&c->tagre);
diff --git a/rc/wmiirc.sh b/rc/wmiirc.sh
index 80cb0fc7..25d8e41b 100644
--- a/rc/wmiirc.sh
+++ b/rc/wmiirc.sh
@@ -51,7 +51,7 @@ wmiir write /colrules <<!
 # Tagging Rules
 wmiir write /rules <<!
     # MPlayer and VLC don't float by default, but should.
-    /MPlayer|VLC/ floating=True
+    /MPlayer|VLC/ floating=on
     # ROX puts all of its windows in the same group, so they open
     # with the same tags.  Disable grouping for ROX Filer.
     /^ROX-Filer:/ group=0
@@ -228,10 +228,10 @@ Key $MODKEY-Control-t # Toggle all other key bindings
 
 KeyGroup Tag actions
 Key $MODKEY-t       # Change to another tag
-	(tag=$(wi_tags | wimenu -h "${hist}.tags" -n 50) && wmiir xwrite /ctl view $tag) &
+	wmiir xwrite /ctl view $(wi_tags | wimenu -h "${hist}.tags" -n 50) &
 Key $MODKEY-Shift-t # Retag the selected client
-	c=$(wi_selclient)
-	(tag=$(wi_tags | wimenu -h "${hist}.tags" -n 50) && wmiir xwrite /client/$c/tags $tag) &
+	# Assumes left-to-right order of evaluation
+	wmiir xwrite /client/$(wi_selclient)/tags $(wi_tags | wimenu -h "${hist}.tags" -n 50) &
 !
 	for i in 0 1 2 3 4 5 6 7 8 9; do
 		cat <<!
@@ -261,7 +261,7 @@ wi_proglist $PATH >$progsfile &
 
 # Setup Tag Bar
 IFS="$wi_newline"
-wmiir rm $(wmiir ls /lbar | sed 's,^,/lbar/,') >/dev/null
+wmiir rm $(wmiir ls -p /lbar) >/dev/null
 seltag=$(wmiir read /tag/sel/ctl | sed 1q)
 unset IFS
 wi_tags | while read tag