Merge remote-tracking branch 'origin/master' into obsd

2 files changed, 8 insertions, 5 deletions

diff --git a/autogen.sh b/autogen.sh
index fc34bd5..da8bf4e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,14 +1,17 @@
 #! /bin/sh
 
-srcdir=`dirname $0`
+srcdir=`dirname "$0"`
 test -z "$srcdir" && srcdir=.
 
 ORIGDIR=`pwd`
-cd $srcdir
+cd "$srcdir"
 
 autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
+cd "$ORIGDIR" || exit $?
+
+git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
+    git config --local format.subjectPrefix "PATCH app/xinit"
 
 if test -z "$NOCONFIGURE"; then
-    $srcdir/configure "$@"
+    exec "$srcdir"/configure "$@"
 fi
diff --git a/xinit.c b/xinit.c
index 1b04911..f826b7a 100644
--- a/xinit.c
+++ b/xinit.c
@@ -638,7 +638,7 @@ shutdown(void)
             Fatal("Unable to run program \"%s\"", "kbd_mode");
             break;
 
-        case 1:
+        case -1:
             Error("fork failed");
             break;