Merge remote-tracking branch 'origin/master' into purdue-cs

Conflicts:
	.config/X11/clientrc
	.config/bash/rc.d/emacs.sh
	.config/bash/rc.sh
	.config/conkeror
	.config/conkerorrc
	.config/emacs/custom.el
	.config/irbrc
	.config/login.sh
	.config/maildirproc/att.rc
	.config/maildirproc/default.rc
	.config/offlineimaprc
	.config/ssh/config
	.config/wmii-hg/autostart
	.config/wmii-hg/include.sh
	.config/wmii-hg/quit
	.config/wmii-hg/rbar_battery
	.config/wmii-hg/rbar_clock
	.config/wmii-hg/rbar_cpu
	.config/wmii-hg/rbar_wifi
	.conkerorrc
	.maildirproc/default.rc

1 files changed, 24 insertions, 0 deletions

diff --git a/.config/wmii-hg/fixes.sh b/.config/wmii-hg/fixes.sh
new file mode 100644
index 0000000..5858859
--- /dev/null
+++ b/.config/wmii-hg/fixes.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# Fix various deficiencies in either the shell or the filesystem
+
+##
+# Usage: ls DIRECTORY
+# Linux's 9p kernel module sometimes omits entries in directory listings
+##
+unalias ls &>/dev/null
+ls() {
+	local real_ls=("$(which ls)" -1F)
+	[ $# = 0 ] && set -- "$PWD"
+	f="${1/#${WMII_DIR}/}"
+	if [ "$f" = "$1" ]; then
+		"${real_ls[@]}" "$f"
+	else
+		wmiir ls "$f"
+	fi
+}
+
+##
+# Usage: setsid cmd [arguments...]
+# I like wmiir's setsid better than linux-utils'
+##
+setsid() { wmiir setsid "$@"; }