# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1424730972 -7200
# Node ID 32379c87626c719e1c1d05316e0922e917b2e51e
# Parent  5168dff8f1ebe2a8d22442a98ea1dc4f384a87e6
Reduced .xinit to test Fvwm in Xnest.

diff -r 5168dff8f1eb -r 32379c87626c .fvwm/xinit
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.fvwm/xinit	Tue Feb 24 00:36:12 2015 +0200
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# To test fvwm. To run with Xnest use:
+#
+#   $ xinit ~/.fvwm/xinit -- `command -v Xnest` :1
+#
+# or:
+#
+#   $ xinit ~/.fvwm/xinit -- `command -v Xephyr` :1
+
+[[ -f ~/.env ]] && . ~/.env || :
+[[ -f ~/.env.local ]] && . ~/.env.local || :
+
+[[ -f ~/.Xdefaults ]] && xrdb -merge ~/.Xdefaults || :
+
+xsetroot -mod 2 2 -fg gray70 -bg gray60
+fvwm -cmd "Module FvwmM4 -m4-prefix -m4-prefix-defines $HOME/.fvwm/config" &
+exec xterm -geometry 80x42 -name "xinitrc" -e bash -i
diff -r 5168dff8f1eb -r 32379c87626c Makefile
--- a/Makefile	Tue Feb 24 00:24:58 2015 +0200
+++ b/Makefile	Tue Feb 24 00:36:12 2015 +0200
@@ -85,7 +85,7 @@
 		fi; \
 	done
 	chmod 700 ~/.gnupg/
-	chmod a+x ~/.fvwm/FvwmKbdd.pl
+	chmod a+x ~/.fvwm/FvwmKbdd.pl ~/.fvwm/xinit
 	command -v fvwm || exit 0; \
 	for f in /etc/xdg/menus/*.menu; do \
 		[ -f "$$f" ] || continue; \