# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1299658884 -7200
# Node ID 774526d0cf47efa4e6ab517da7af6919e38c035a
# Parent  d342461b401b182e419c10a3eaf4c1be11bdfc57# Parent  56812afaac27ce43848b8ad663a94b57af26957d
merged

diff -r d342461b401b -r 774526d0cf47 .Xdefaults
--- a/.Xdefaults	Wed Feb 09 10:57:19 2011 +0200
+++ b/.Xdefaults	Wed Mar 09 10:21:24 2011 +0200
@@ -17,6 +17,20 @@
 ! emacs.geometry: 20x20+0+0
 ! emacs.FontBackend: xft
 
+XTerm*background: white
+XTerm*foreground: black
+XTerm*cursorColor: brown
+! Allow Alt as Meta in Emacs:
+XTerm*eightBitInput: false
+XTerm*metaSendsEscape: true
+! When an interactive shell that is not a login shell is started, bash reads
+! and executes commands from /etc/bash.bashrc and ~/.bashrc, if these files
+! exist.
+! By default 'xterm' start shell with '-i', so it interactive. But if it also
+! login shell then ~/.bashrc will not be read. Awful!
+XTerm*loginShell: false
+
+
 Rxvt*background: white
 Rxvt*foreground: black
 Rxvt*cursorColor: brown
@@ -25,14 +39,14 @@
 ! Rxvt*boldFont: 7x14
 Rxvt*scrollBar: on
 Rxvt*saveLines: 5000
-! By default rxvt start shell without args, so it interactive. But if it also login shell
-! then ~/.bashrc will not be read. Awful!
+! When an interactive shell that is not a login shell is started, bash reads
+! and executes commands from /etc/bash.bashrc and ~/.bashrc, if these files
+! exist.
+! By default rxvt start shell without args, so it interactive. But if it also
+! login shell then ~/.bashrc will not be read. Awful!
 Rxvt*loginShell: false
 
 xpdf*initialZoom: width
 
-! xterm*font: 10x20
-! XTerm*loginShell: true
-
 ! Xft.hinting: none
 ! Xft.dpi: 96
diff -r d342461b401b -r 774526d0cf47 .bashrc
--- a/.bashrc	Wed Feb 09 10:57:19 2011 +0200
+++ b/.bashrc	Wed Mar 09 10:21:24 2011 +0200
@@ -2,6 +2,8 @@
 # XXX
 # [ -f /etc/bashrc ] && . /etc/bashrc
 
+[ -d ~/usr/bin ] && export PATH="$PATH":~/usr/bin || :
+
 # XXX for mc, cvs, svn, ...
 # export EDITOR=vim
 
diff -r d342461b401b -r 774526d0cf47 .hgrc
--- a/.hgrc	Wed Feb 09 10:57:19 2011 +0200
+++ b/.hgrc	Wed Mar 09 10:21:24 2011 +0200
@@ -1,7 +1,9 @@
 ; -*- mode: ini-generic; coding: utf-8 -*-
 
 [ui]
+; Who are you?
 username = Oleksandr Gavenko <gavenkoa@gmail.com>
+; Use internal merge engine. When merge fail you see <<<<<< ====== >>>>>> and a .orig file.
 merge = internal:merge
 editor = emacs -q
 
@@ -14,24 +16,14 @@
 encoding = utf-8
 
 [extensions]
-; For old Mercurial.
-; fetch =
+; To allow 'fetch' command.
 hgext.fetch =
+; To allow Mercurial Queues.
 hgext.mq =
+; To import revisions from foreign VCS repositories into Mercurial.
 hgext.convert =
 ; Usage:  hg glog <dir>
 hgext.graphlog =
-; hgext.win32text =
+; Enable '.hgeol' tracking (fix for CR/LF).
+hgext.eol =
 
-; [encode]
-; **.py = cleverencode:
-; **.c = cleverencode:
-; **.h = cleverencode:
-; **.java = cleverencode:
-; **.txt = cleverencode:
-; [decode]
-; **.py = cleverdecode:
-; **.c = cleverdecode:
-; **.h = cleverdecode:
-; **.java = cleverdecode:
-; **.txt = cleverdecode:
diff -r d342461b401b -r 774526d0cf47 .mc/bindings
--- a/.mc/bindings	Wed Feb 09 10:57:19 2011 +0200
+++ b/.mc/bindings	Wed Mar 09 10:21:24 2011 +0200
@@ -156,6 +156,11 @@
 	Open=%cd %p#urar
 	View=%view{ascii} rar v -c- %f
 
+# cab
+regex/\.([cC][aA][bB])$
+	Open=%cd %p#ucab
+	View=%view{ascii} cabextract -l %f
+
 # cpio
 shell/.cpio.Z
 	Open=%cd %p#ucpio
diff -r d342461b401b -r 774526d0cf47 .xinitrc
--- a/.xinitrc	Wed Feb 09 10:57:19 2011 +0200
+++ b/.xinitrc	Wed Mar 09 10:21:24 2011 +0200
@@ -7,6 +7,13 @@
 # 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" &
 
+# Root window parameter.
+# Color names check from /etc/X11/rgb.txt or enter in hex: #aabbcc.
+# xsetroot -gray -fg red -bg white
+# xsetroot -bitmap dir/file.bitmap -fg red -bg white
+# xsetroot -mod 3 3 -fg red -bg white
+xsetroot -gray
+
 # Don't use fvwm under Cygwin.
 if [ -z "$COMSPEC" ]; then
   fvwm &