# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1329570536 -7200
# Node ID c15b2b668c00fbff17a67af8b9bafa7f35bc9e60
# Parent  d1a4574fa53407b05f46ddff3280364b6a48125f# Parent  43cce0f0dae37aa84a32ab4bfe34a8a0e9f08c4d
merged

diff -r d1a4574fa534 -r c15b2b668c00 .bashrc
--- a/.bashrc	Mon Feb 13 17:06:41 2012 +0200
+++ b/.bashrc	Sat Feb 18 15:08:56 2012 +0200
@@ -18,9 +18,9 @@
   ;;
 esac
 
-# if [[ -f ~/.dircolors ]]; then
-#   eval `dircolors -b ~/.dircolors`
-# fi
+if command -v dircolors >/dev/null 2>&1 && [[ -f ~/.dircolors ]]; then
+  eval "`dircolors -b ~/.dircolors`"
+fi
 
 # Don't store duplicate adjacent items in the history.
 #   ignorespace     do not save lines that start with space
@@ -89,19 +89,15 @@
 # make and change to a directory
 md () { mkdir -p "$1" && cd "$1"; }
 
-# GREP_COLOR=bright yellow on black bg.
-# use GREP_COLOR=7 to highlight whitespace on black terminals
-# LANG=C for speed. See also: http://www.pixelbeat.org/scripts/findrepo
-# alias grep='GREP_COLOR="1;33;40" LANG=C grep --color=auto'
+# LANG=C for speed.
+alias grep='GREP_COLOR="31;47" LANG=C grep -n --color=auto'
+alias ls='ls --color=auto'
+alias minicom='minicom -c on'
 
-# alias ls="BLOCK_SIZE=\'1 ls --color=auto" #enable thousands grouping and colour
-# alias minicom='minicom -c on' #enable colour
-# alias cal='cal -3' #show 3 months by default
-# alias units='units -t' #terse mode
+# show 3 months by default
+alias cal='cal -3'
+
 # alias diff='LC_ALL=C TZ=GMT0 diff -Naur' #normalise diffs for distribution
-# alias lynx='lynx -force_html -width=$COLUMNS' #best settings for viewing HTML
-# alias links='links -force-html' #need to enable colour in config menu manually
-# alias xterm='xterm -fb "" -bg black -fg gray -fa "Sans Mono" -fs 10 +sb -sl 3000 -g 80x50+1+1'
 # alias sudo='sudo env PATH=$PATH' #work around sudo built --with-secure-path (ubuntu)
 # alias vim='vim -X' #don't try to contact xserver (which can hang on network issues)
 # alias gdb='gdb -tui' #enable the text window interface if possible
diff -r d1a4574fa534 -r c15b2b668c00 .dircolors
--- a/.dircolors	Mon Feb 13 17:06:41 2012 +0200
+++ b/.dircolors	Sat Feb 18 15:08:56 2012 +0200
@@ -7,66 +7,61 @@
 # Background color codes:
 # 40=black 41=red 42=green 43=yellow 44=blue 45=magenta 46=cyan 47=white
 
-# Global default.
 NORMAL 00
 FILE 00
 DIR 01;34
-LINK 01;36
-FIFO 40;33
-SOCK 01;35
-DOOR 01;35
-# Block device driver.
-BLK 40;33;01
-# Character device driver.
-CHR 40;33;01
-# Symlink to nonexistent file.
-ORPHAN 40;31;01
-# Files with execute permission.
-EXEC 01;32
+LINK 04;36
+ORPHAN 01;31;40
+# MISSING 01;31;40
+FIFO 33;40
+SOCK 33;40
+DOOR 33;40
+BLK 43
+CHR 43
+EXEC 04;31
 
-.cmd 01;32
-.exe 01;32
-.com 01;32
-.btm 01;32
-.bat 01;32
+.cmd 32
+.exe 32
+.com 32
+.bat 32
 
-.tar 01;31
-.tgz 01;31
-.arj 01;31
-.taz 01;31
-.lzh 01;31
-.zip 01;31
-.z 01;31
-.Z 01;31
-.gz 01;31
-.bz2 01;31
-.deb 01;31
-.rpm 01;31
-.jar 01;31
+.tar 36
+.tgz 36
+.arj 36
+.taz 36
+.lzh 36
+.zip 36
+.z 36
+.Z 36
+.gz 36
+.bz2 36
+.deb 36
+.rpm 36
+.jar 36
 
-.jpg 0;32
-.jpe 0;32
-.jpeg 0;32
-.gif 0;32
-.bmp 0;32
-.pbm 0;32
-.pgm 0;32
-.ppm 0;32
-.tga 0;32
-.xbm 0;32
-.xpm 0;32
-.tif 0;32
-.tiff 0;32
-.png 0;32
-.eps 0;32
-.mpg 0;32
-.mpeg 0;32
-.avi 0;32
-.fli 0;32
-.gl 0;32
-.dl 0;32
-.xcf 0;32
-.xwd 0;32
+.jpg 32
+.jpe 32
+.jpeg 32
+.gif 32
+.bmp 32
+.pbm 32
+.pgm 32
+.ppm 32
+.tga 32
+.xbm 32
+.xpm 32
+.tif 32
+.tiff 32
+.png 32
+.eps 32
+.mpg 32
+.mpeg 32
+.avi 32
+.fli 32
+.gl 32
+.dl 32
+.xcf 32
+.xwd 32
 
 .ogg 01;35
 .mp3 01;35
diff -r d1a4574fa534 -r c15b2b668c00 .mc/bindings
--- a/.mc/bindings	Mon Feb 13 17:06:41 2012 +0200
+++ b/.mc/bindings	Sat Feb 18 15:08:56 2012 +0200
@@ -547,7 +547,7 @@
 shell/.f
     Open=e %f
 regex/\.(sh|bash|tcsh)
-    Open=e %f
+    Edit=e %f
 
 # Object files.
 regex/\.(o|obj)