From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed, 31 Jul 2013 13:53:17 +0000 (+0200)
Subject: Merge branch 'master' of ssh://vps.jankratochvil.net/var/lib/git/nethome
X-Git-Url: http://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=a3392429ebb7b1b97e610f567e5f345ffb8cb178;hp=-c

Merge branch 'master' of ssh://vps.jankratochvil.net/var/lib/git/nethome
---

a3392429ebb7b1b97e610f567e5f345ffb8cb178
diff --combined .bashrc
index 321bc2e,a174b84..a63f2ed
--- a/.bashrc
+++ b/.bashrc
@@@ -153,8 -153,11 +153,11 @@@ eval 
  	function gdbn { gdb -nx --command=~/.gdbinit "$@"; }
  	function hd { od -Ax -tx1; }
  	function wget {(unset wget; ( wget --no-check-certificate "$@"; ); );}
+ 	function ucwkbd { setxkbmap -layout us,cz -variant ,ucw -option grp:caps_switch; }
  '
  
+ unset command_not_found_handle
+ shopt -u progcomp # Disable 'bash-completion' rpm
  export IGNOREEOF=10
  # '2>/dev/null' to prevent: TMOUT: readonly variable
  [ -n "$SSH_TTY" ] && export TMOUT=900 2>/dev/null
@@@ -341,8 -344,6 +344,6 @@@ function gdbcvscheckout { sourcewarecvs
  function binutilscvscheckout { sourcewarecvscheckout binutils; }
  function uri_escape   { perl -MURI::Escape -le '$_=<>;chomp;print uri_escape   $_;'; };
  function uri_unescape { perl -MURI::Escape -le '$_=<>;chomp;print uri_unescape $_;'; };
- # It cannot be a function - unset does not work for it.
- alias youtube-dl='youtube-dl --format 38/37/45/22/44/35/34/18/6/5/17/13'
  alias fetchmail='n fetchmail'
  function rpmsrclist
  {
@@@ -379,7 -380,6 +380,7 @@@ function gpg {(unset gpg; http_proxy= a
  ulimit -S -c 0
  set +H
  shopt -s mailwarn
 +shopt -s direxpand
  unset OPTIND
  umask 022