Merge branch 'master' of bitbucket.org:/ambrevar/home-config

master
Pierre Neidhardt 2013-07-31 08:35:50 +02:00
commit 3055359ed8
2 changed files with 3 additions and 4 deletions

View File

@ -100,7 +100,7 @@ alias xres='xrandr -s $(xrandr | awk '"'"'/^ / {print $1;exit}'"'"')'
#alias -g G='| grep -'
#alias -g L='| less'
## Now just type the image name to launch irfanview
## Now just type the image name to launch your image preview
#alias -s jpg='/usr/bin/sxiv'
# fi
@ -108,7 +108,6 @@ alias xres='xrandr -s $(xrandr | awk '"'"'/^ / {print $1;exit}'"'"')'
##==============================================================================
## Emacs
##==============================================================================
## 'em' is a wrapper script for emacsclient.
if [ -n "$(command -v em)" ]; then
alias emacs-reload="emacsclient -e '(kill-emacs)' >/dev/null 2>&1; emacs --daemon"
fi

View File

@ -40,8 +40,8 @@ MULTIHARDLINK 1;37 # regular file with more than one link
.zoo 91
## Disc image
.img 4;31
.iso 4;31
.img 4;91
.iso 4;91
# Image formats (underlined yellow)
.bmp 4;33