# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1272135113 -10800
# Node ID 505fcddef5c343ec856aa4cb6209bef5b54462be
# Parent  78d46cc0da4112d23bf1212ca3bb5c4b2a5a55cd# Parent  0980cc675a28da83936c81c82abaa2b4b3c8c832
Automated merge with file:///cygdrive/d/srv/hg/skel

diff -r 0980cc675a28 -r 505fcddef5c3 .bashrc
--- a/.bashrc	Sat Apr 24 21:51:21 2010 +0300
+++ b/.bashrc	Sat Apr 24 21:51:53 2010 +0300
@@ -85,7 +85,10 @@
 # what most people want from od (hexdump)
 # alias hd='od -Ax -tx1z -v'
 
-alias indent-bifit="indent -bap -bbo -br -brs -cdb -cdw -ce -cli0 -c0 -cs -d0 -di0 -hnl -l120 -lc90 -i4 -npcs -ppi 3 -npsl -nut -sbi4 -sc"
+# --blank-lines-after-procedures --break-before-boolean-operator --braces-on-if-line --braces-on-struct-decl-line
+# --comment-indentationn --space-after-cast --line-comments-indentationn --declaration-indentationn --honour-newlines
+# --no-space-after-function-call-names --no-tabs --struct-brace-indentationn --start-left-side-of-comments
+alias indent-bifit="indent -bap -bbo -br -brs -cdw -ce -cli0 -c0 -cs -d0 -di0 -hnl -l120 -lc90 -i4 -npcs -ppi 3 -npsl -nut -sbi4 -sc"
 
 # canonicalize path (including resolving symlinks)
 # alias realpath='readlink -f'
diff -r 0980cc675a28 -r 505fcddef5c3 .xinitrc
--- a/.xinitrc	Sat Apr 24 21:51:21 2010 +0300
+++ b/.xinitrc	Sat Apr 24 21:51:53 2010 +0300
@@ -7,7 +7,10 @@
 # Because of bug in xorg invoking setxkbmap cause disable repeat char when key pressed.
 # setxkbmap -rules xorg -model pc104 -layout "us,ru" -option "grp:rwin_toggle,grp_led:scroll" &
 
-fvwm &
+# Don't use fvwm under Cygwin.
+if [ -z "$COMSPEC" ]; then
+  fvwm &
+fi
 
 # Last command.
 exec xterm -e bash -i