Permalink
Browse files

.vimrc conflicts

  • Loading branch information...
zarac committed Feb 14, 2012
2 parents 80f8e7e + d38c554 commit 8c21a95243f878c5bbe4bcce3086fd4822e6cea0
Showing with 6 additions and 2 deletions.
  1. +1 −0 .bashrc
  2. +5 −2 .vimrc
View
@@ -160,6 +160,7 @@ alias gr='git remote -v'
alias gd='git diff'
alias gdc='git diff --cached'
alias gds='git stash show --patience' # might be a better way it does the job)
+alias mahmysql='mysql -h195.178.232.7 -uDA211T10C4062119 -p -DDA211T10C4062119'
# Other
View
7 .vimrc
@@ -659,7 +659,7 @@
""" Windows {{{
" resize horizontal splits
nmap + <C-W>+
- nmap - <C-W>-
+ nmap <A-=> <C-W>-
" resize vertical splits
" ToDo: Why doesn't this work!?
@@ -877,6 +877,8 @@
"" easier home
nmap <silent> \h :cd ~<CR>
+
+ "" easier opening of files at my mah-website
nmap <silent> ,em :e ftp://m10p2661@ftphome.mah.se/public_html/
"" }}}
@@ -1074,6 +1076,7 @@
""" CSharp / C# / cs.vim {{{
" Handy info: http://vim.wikia.com/wiki/Integrate_gvim_with_Visual_Studio
" http://www.vim.org/scripts/script.php?script_id=1895
+ " http://kevin-berridge.blogspot.com/2008/09/vim-c-compiling.html
""" }}}
""" Python {{{
@@ -1143,7 +1146,7 @@
set columns=100
set lines=40
endif
- set guifont=Consolas:h14:cANSI
+ set guifont=Consolas:h10:cANSI
"set shell=C:\\Program\\\ Files\\\ (x86)\\Git\\bin\\sh.exe
"set shell=C:\\Program\\\ Files\ (x86)\\Git\\bin\\sh.exe
"set shell=C:\\Program\ Files\ (x86)\\Git\\bin\\sh.exe\ -login\ -i

0 comments on commit 8c21a95

Please sign in to comment.