Andres Vargas avatar Andres Vargas committed 9bf4a0b

fixing things

Comments (0)

Files changed (2)

 # the name of the git branch in the current directory
 set_git_branch() {
     unset GIT_BRANCH
-#    local branch=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1 /'`;
+    local branch=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1 /'`;
 
- #   if [ -n $branch ];
- #       then
-  #          GIT_BRANCH="${EMG}git:${NONE}$branch"
-  #  fi
+    if [ -n $branch ];
+        then
+           GIT_BRANCH="${EMG}git:${NONE}$branch"
+    fi
 }
 
 # the name of the hg branch in the current directory
 
 update_prompt() {
     set_new_pwd
-    set_git_branch
     set_svn_rev
     parse_svn_branch
     set_hg_branch
 }
 
 PROMPT_COMMAND=update_prompt
+$PS1="\[\033[G\]$PS1"
 
 filetype on
 filetype plugin on
 filetype indent plugin on
+set smartindent
+set tabstop=4
+set shiftwidth=4
+set expandtab
+
 set ai
 syntax on
 autocmd FileType python set omnifunc=pysmell#Complete
 autocmd FileType html set omnifunc=htmlcomplete#CompleteTags
 autocmd FileType css set omnifunc=csscomplete#CompleteCSS
 
-autocmd FileType python match ErrorMsg '\%>80v.\+'
 
 autocmd BufRead,BufNewFile *.py set smartindent cinwords=if,elif,else,for,while,with,try,except,finally,def,class
 
 autocmd FileType python setlocal expandtab shiftwidth=4 tabstop=8 softtabstop=4 smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class,with foldmethod=indent foldlevel=99999
+autocmd FileType php setlocal expandtab shiftwidth=4 tabstop=8 softtabstop=4 smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class,with foldmethod=indent foldlevel=99999
 autocmd BufRead,BufNewFile *.html setlocal so=2 expandtab shiftwidth=2 tabstop=2 softtabstop=2 smartindent
 autocmd BufRead,BufNewFile *.js setlocal so=2 expandtab shiftwidth=2 tabstop=2 softtabstop=2 smartindent
 autocmd BufRead,BufNewFile *.recipe setlocal expandtab shiftwidth=4 tabstop=8 softtabstop=4 smartindent cinwords=if,elif,else,for,while,try,except,finally,def,class,with foldmethod=indent foldlevel=99999
 noremap <F6> :!ctags -R -f ./tags; pysmell  `python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`<CR>
 nnoremap <silent> ,q :bp<CR>
 nnoremap <silent> ,w :bn<CR>
+nnoremap <silent> ,x :tabnext<CR>
+nnoremap <silent> ,z :tabprev<CR>
+nnoremap <silent> ,a :tabnew<CR>
 nnoremap <silent> ,d :Bclose<CR>
 nnoremap <silent> ,s :wall!<CR>
 nnoremap <silent> ,t :!touch django.wsgi<CR>
 
 set shortmess=atI " Shortens messages in status line.
 set laststatus=2 " Always show status line.
-set wildignore+=*.pyc,*.pyo " Ignore compiled Python files
+set wildignore+=*.pyc,*.pyo,*.db,PYSMELLTAGS " Ignore compiled Python files
 set foldenable " Turn on folding.
 nmap <F12> :!pycheck %<CR>
 
 if has('gui_running')
-    set background=light
+    set background=dark
 else
     set background=dark
 endif
 set t_Co=256
 syntax on
 let g:solarized_termcolors=256
-set t_Co=256
-colo solarized
 
 nnoremap _hd :set ft=htmldjango<CR>
 nnoremap _pd :set ft=python.django<CR>
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.