# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1333475243 -10800
# Node ID 11e6e7e70fa0360442903e8978ff8f9affc76a2a
# Parent  27b778ebe490d166bbc29810eb266f4ac6245db5# Parent  d0201811d371163b26460e601165fc7c6ba54b36
merged

diff -r d0201811d371 -r 11e6e7e70fa0 .bashrc
--- a/.bashrc	Mon Mar 19 11:34:59 2012 +0200
+++ b/.bashrc	Tue Apr 03 20:47:23 2012 +0300
@@ -94,8 +94,9 @@
 alias ls='ls --color=auto'
 alias minicom='minicom -c on'
 
-# show 3 months by default
+# Show 3 months. Weeks start on Monday.
 alias cal='cal -3'
+alias ncal='ncal -3 -M'
 
 # alias diff='LC_ALL=C TZ=GMT0 diff -Naur' #normalise diffs for distribution
 # alias sudo='sudo env PATH=$PATH' #work around sudo built --with-secure-path (ubuntu)
diff -r d0201811d371 -r 11e6e7e70fa0 .mc/bindings
--- a/.mc/bindings	Mon Mar 19 11:34:59 2012 +0200
+++ b/.mc/bindings	Tue Apr 03 20:47:23 2012 +0300
@@ -315,8 +315,7 @@
 	View=%view{ascii} ogginfo %s
 
 regex/\.([mM][iI][dD][iI]?|[rR][mM][iI][dD]?)$
-	Open=run-mailcap audio/midi:%f &
-	#Open=timidity %f
+	Open=run-mailcap audio/midi:%f
 
 regex/\.([wW][mM][aA])$
 	Open=mplayer -vo null %f
diff -r d0201811d371 -r 11e6e7e70fa0 .pylintrc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.pylintrc	Tue Apr 03 20:47:23 2012 +0300
@@ -0,0 +1,28 @@
+# Brain-dead errors regarding standard language features
+#   W0142 = *args and **kwargs support
+#   W0403 = Relative imports
+
+# Pointless whinging
+#   R0201 = Method could be a function
+#   W0212 = Accessing protected attribute of client class
+#   W0613 = Unused argument
+#   W0232 = Class has no __init__ method
+#   R0903 = Too few public methods
+#   C0301 = Line too long
+#   R0913 = Too many arguments
+#   C0103 = Invalid name
+#   R0914 = Too many local variables
+
+# PyLint's module importation is unreliable
+#   F0401 = Unable to import module
+#   W0402 = Uses of a deprecated module
+
+# Already an error when wildcard imports are used
+#   W0614 = Unused import from wildcard
+
+# Sometimes disabled depending on how bad a module is
+#   C0111 = Missing docstring
+
+# Disable the message(s) with the given id(s).
+disable-msg=W0142,W0403,R0201,W0212,W0613,W0232,R0903,W0614,C0111,C0301,R0913,C0103,F0401,W0402,R0914
+
diff -r d0201811d371 -r 11e6e7e70fa0 .pystartup
--- a/.pystartup	Mon Mar 19 11:34:59 2012 +0200
+++ b/.pystartup	Tue Apr 03 20:47:23 2012 +0300
@@ -23,9 +23,9 @@
 
 term_with_colors = ['xterm', 'xterm-color', 'xterm-256color', 'linux', 'screen', 'screen-256color', 'screen-bce']
 if os.environ.get('TERM') in term_with_colors:
-    green='\033[32m'
-    red='\033[31m'
-    reset='\033[0m'
+    green='\001\033[32m\002'
+    red='\001\033[31m\002'
+    reset='\001\033[0m\002'
     sys.ps1 = red + '>>> ' + reset
     sys.ps2 = green + '... ' + reset
 del term_with_colors
diff -r d0201811d371 -r 11e6e7e70fa0 .xinitrc
--- a/.xinitrc	Mon Mar 19 11:34:59 2012 +0200
+++ b/.xinitrc	Tue Apr 03 20:47:23 2012 +0300
@@ -24,4 +24,4 @@
 fi
 
 # Last command.
-exec xterm -e bash -i
+exec xterm -geometry 80x42 -e bash -i
diff -r d0201811d371 -r 11e6e7e70fa0 Makefile
--- a/Makefile	Mon Mar 19 11:34:59 2012 +0200
+++ b/Makefile	Tue Apr 03 20:47:23 2012 +0300
@@ -36,6 +36,7 @@
 OVERRIDDEN_ITEMS = \
     .inputrc .minttyrc .Xdefaults .xinitrc .xserverrc .screenrc .dircolors \
     .bashrc .bash_path .bash_completion .zshrc .vimrc .ssh .pystartup \
+    .pylintrc \
     .signature .muttrc .tidy \
     .dictrc \
     .hgrc .hgignore .hgstyle .bazaar .gitconfig .gitignore .cvsrc \