Merge branch 'master' of https://github.com/exhuma/vimfiles

UltiSnips/html.snippets

@@ -0,0 +1,10 @@
+snippet scriptsrc "Load script from source" b
+<script src="${0}" type="text/javascript">
+endsnippet
+
+snippet script "Inline script" b
+<script type="text/javascript">
+	${0}
+</script>
+endsnippet
+

UltiSnips/xhtml.snippets

@@ -0,0 +1,10 @@
+snippet scriptsrc "Load script from source" b
+<script src="${0}" type="text/javascript">
+endsnippet
+
+snippet script "Inline script" b
+<script type="text/javascript">
+	${0}
+</script>
+endsnippet
+

vimrc

@@ -72,7 +72,6 @@ set listchars+=precedes:←
 set listchars+=nbsp:◊
 set title
 set foldcolumn=5
-set nowrap
 set background=dark
 set t_Co=256
 set cmdheight=2
@@ -93,6 +92,15 @@ set ruler
 set showcmd
 set timeout timeoutlen=1000 ttimeoutlen=100
 
+if has("patch-7.4.338")
+    set wrap
+    set breakindent
+    set breakindentopt=sbr
+    set showbreak=>
+else
+    set nowrap
+endif
+
 if has('autocmd')
     autocmd BufReadPost *
         \ if line("'\"") > 0 && line("'\"") <= line("$") |
@@ -198,6 +206,9 @@ inoremap jj <Esc>
 nnoremap <leader><space> :noh<CR>
 nmap <space> <leader>
 
+nmap <F4> a<C-R>=strftime("%Y-%m-%d %H:%M:%S")<CR><ESC>
+imap <F4> <C-R>=strftime("%Y-%m-%d %H:%M:%S")<CR>
+
 " Fix to make <C-PageUp/Down> work in tmux
 nnoremap [5^ :tabprev<CR>
 nnoremap [6^ :tabnext<CR>