dotfiles.git

@@ -37,6 +37,8 @@ else

     fi

 fi

+export P4DIFF='vim -d'  # Override from the command line: "P4DIFF=; p4 diff main.py"

+

 alias grep='grep --color=auto'

 alias fgrep='fgrep --color=auto'

 alias egrep='egrep --color=auto'

@@ -1,4 +1,4 @@

-" Version 2016-04-07.1 - OpenInOtherWindow()

+" Version 2016-09-25.1 - php mods

 set nocompatible    " Use Vim defaults, forget compatibility with vi.

 set bs=2            " allow backspacing over everything in insert mode

 set wildmenu        " Allows command-line completion with tab

@@ -186,13 +186,13 @@ if has("autocmd")

   autocmd BufWrite *.py :call DeleteTrailingWS()  " Delete trailing whitespace

   " Don't let smartindent unindent the # character in Python files

   autocmd FileType python  inoremap # X<c-h>#

-  autocmd FileType c,cpp,python,brs  set expandtab  " Use spaces instead of tabs

+  autocmd FileType c,cpp,python,php,brs  set expandtab  " Use spaces instead of tabs

   autocmd Filetype make    setl noexpandtab       " ...not for files that use tabs.

   " Use the vim command %retab before applying the following

   " two with files that have 8-space tabs.

-  autocmd FileType c,cpp,python  set tabstop=4

-  autocmd FileType c,cpp,python  set shiftwidth=4

+  autocmd FileType c,cpp,python,php  set tabstop=4

+  autocmd FileType c,cpp,python,php  set shiftwidth=4

   autocmd FileType python  set foldmethod=indent  " 'za' to fold

   autocmd FileType python  set foldlevel=99

@@ -215,8 +215,6 @@ if has("autocmd")

   autocmd BufRead *.txt set wrap linebreak nolist  " "soft" wrap of existing lines

   autocmd BufRead README set wrap linebreak nolist " "soft" wrap of existing lines

-  autocmd BufRead *.c,*.cpp,*.python,*.h,*.hpp,*.js set nowrap

-

   " When editing a file, always jump to the last cursor position

   autocmd BufReadPost *

   \ if line("'\"") > 0 && line ("'\"") <= line("$") |