# HG changeset patch # User Oleksandr Gavenko <gavenkoa@gmail.com> # Date 1331373481 -7200 # Node ID 27b778ebe490d166bbc29810eb266f4ac6245db5 # Parent c15b2b668c00fbff17a67af8b9bafa7f35bc9e60# Parent 004aa35854345815b69cd456ae30e07e59841401 Automated merge with file:///home/srv/hg/skel diff -r c15b2b668c00 -r 27b778ebe490 .bashrc --- a/.bashrc Sat Feb 18 15:08:56 2012 +0200 +++ b/.bashrc Sat Mar 10 11:58:01 2012 +0200 @@ -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 c15b2b668c00 -r 27b778ebe490 .mc/bindings --- a/.mc/bindings Sat Feb 18 15:08:56 2012 +0200 +++ b/.mc/bindings Sat Mar 10 11:58:01 2012 +0200 @@ -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 c15b2b668c00 -r 27b778ebe490 .pylintrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.pylintrc Sat Mar 10 11:58:01 2012 +0200 @@ -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 c15b2b668c00 -r 27b778ebe490 .pystartup --- a/.pystartup Sat Feb 18 15:08:56 2012 +0200 +++ b/.pystartup Sat Mar 10 11:58:01 2012 +0200 @@ -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 c15b2b668c00 -r 27b778ebe490 .xinitrc --- a/.xinitrc Sat Feb 18 15:08:56 2012 +0200 +++ b/.xinitrc Sat Mar 10 11:58:01 2012 +0200 @@ -24,4 +24,4 @@ fi # Last command. -exec xterm -e bash -i +exec xterm -geometry 80x42 -e bash -i diff -r c15b2b668c00 -r 27b778ebe490 Makefile --- a/Makefile Sat Feb 18 15:08:56 2012 +0200 +++ b/Makefile Sat Mar 10 11:58:01 2012 +0200 @@ -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 \