Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:hanzhixing/.vim

  • Loading branch information...
commit 5d1f74384d67f8bf518f6096be86aa53386390d0 2 parents 101f843 + 1930d82
Zhixing Han authored
Showing with 56 additions and 8 deletions.
  1. +7 −6 README
  2. +46 −0 syntax/phtml.vim
  3. +3 −2 vimrc
13 README
View
@@ -1,17 +1,18 @@
STEPS FOR THE FIRST TIME:
cd ~
+rm -rf ~/.vim/
git clone git@github.com:hanzhixing/.vim.git
ln -sf ~/.vim/vimrc ~/.vimrc
cd .vim
mkdir bundle
cd bundle
-git clone git://github.com/tpope/vim-pathogen.git
-git clone git://github.com/scrooloose/nerdtree.git
-git clone git://github.com/vim-scripts/taglist.vim.git
-git clone git://github.com/vim-scripts/bufexplorer.zip.git
-git clone git://github.com/fholgado/minibufexpl.vim.git
-git clone git://github.com/vim-scripts/matchit.zip.git
+git clone https://github.com/tpope/vim-pathogen.git
+git clone https://github.com/scrooloose/nerdtree.git
+git clone https://github.com/vim-scripts/taglist.vim.git
+git clone https://github.com/vim-scripts/bufexplorer.zip.git
+git clone https://github.com/fholgado/minibufexpl.vim.git
+git clone https://github.com/vim-scripts/matchit.zip.git
vim
:Helptags
:q
46 syntax/phtml.vim
View
@@ -0,0 +1,46 @@
+" Vim syntax file
+" Language: PHP Templates (Solarphp, PHPSavant etc...)
+" Maintainer: Giuliani Sanches (giulianit at gmail dot com)
+" URL: http://giulianisanches.blogspot.com
+" Last Change: 2007 Novembro 20
+" Version: 0.1.2
+"
+" ###################################################################################################
+" Based on Armin Ronacher mako.vim syntax file (http://www.vim.org/scripts/script.php?script_id=1858)
+" ###################################################################################################
+"
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+if version < 600
+ syntax clear
+elseif exists("b:current_syntax")
+ finish
+endif
+
+if !exists("main_syntax")
+ let main_syntax = "html"
+endif
+
+"Source the html syntax file
+ru! syntax/html.vim
+unlet b:current_syntax
+
+"Put the php syntax file in @phpTop
+syn include @phpTop syntax/php.vim
+
+" Block rules
+syn region phpBlock start=#<?php# end=#?># keepend contains=@phpTop
+
+" Default highlighting links
+if version >= 508 || !exists("did_php_syn_inits")
+ if version < 508
+ let did_php_syn_inits = 1
+ com -nargs=+ HiLink hi link <args>
+ else
+ com -nargs=+ HiLink hi def link <args>
+ endif
+
+ delc HiLink
+endif
+
+let b:current_syntax = "html"
5 vimrc
View
@@ -1,5 +1,5 @@
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" General (2012-05-11)
+" General (2012-02-07)
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" Load pathogen plugin anyway. important!
runtime bundle/vim-pathogen/autoload/pathogen.vim
@@ -186,7 +186,7 @@ set expandtab
" the width of '>' operator indenting
set shiftwidth=4
-"set tabstop=4
+set tabstop=4
" 4 spaces for one pressing, '<tab>' character for twice pressing
set softtabstop=4
@@ -252,6 +252,7 @@ let Tlist_Enable_Fold_Column = 0
let Tlist_Compact_Format = 1
let Tlist_File_Fold_Auto_Close = 0
let Tlist_GainFocus_On_ToggleOpen = 1
+let tlist_php_settings='php;f:function'
if has("mac") || has("gui_macvim")
map <F6> :TlistToggle<cr>
Please sign in to comment.
Something went wrong with that request. Please try again.