Mercurial > ec-dotfiles
changeset 552:6084b6b425ad
Merge from remote.
| author | nanaya <me@myconan.net> |
|---|---|
| date | Tue, 14 Apr 2015 04:48:52 +0900 |
| parents | 138ee2cd2179 (current diff) a056f6920d8e (diff) |
| children | a10fbcba6cd1 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/rc/bashrc Tue Apr 14 04:47:54 2015 +0900 +++ b/rc/bashrc Tue Apr 14 04:48:52 2015 +0900 @@ -268,8 +268,8 @@ unset _rm if command -v curl > /dev/null 2>&1; then - alias 0p="gzip | curl 'http://0paste.com/pastes.txt' -F 'paste[paste_gzip]=<-'" - alias 0pp="gzip | curl 'http://0paste.com/pastes.txt' -F 'paste[is_private]=1' -F 'paste[paste_gzip]=<-'" + alias 0p="gzip | curl 'http://0paste.tk/pastes.txt' -F 'paste[paste_gzip]=<-'" + alias 0pp="gzip | curl 'http://0paste.tk/pastes.txt' -F 'paste[is_private]=1' -F 'paste[paste_gzip]=<-'" fi if command -v tmux > /dev/null 2>&1; then
--- a/vendor/vim-syntax/blade.vim Tue Apr 14 04:47:54 2015 +0900 +++ b/vendor/vim-syntax/blade.vim Tue Apr 14 04:48:52 2015 +0900 @@ -13,9 +13,9 @@ silent! unlet b:current_syntax " Echos -syn region bladeUnescapedEcho matchgroup=bladeEchoDelim start=/@\@<!\s*{!!/ end=/!!}\s*/ oneline contains=@phpClTop containedin=ALLBUT,bladeComment -syn region bladeEscapedEcho matchgroup=bladeEchoDelim start=/@\@<!\s*{{{\@!/ end=/}}\s*/ oneline contains=@phpClTop containedin=ALLBUT,bladeComment -syn region bladeEscapedEcho matchgroup=bladeEchoDelim start=/@\@<!\s*{{{{\@!/ end=/}}}/ oneline contains=@phpClTop containedin=ALLBUT,bladeComment +syn region bladeUnescapedEcho matchgroup=bladeEchoDelim start=/@\@<!\s*{!!/ end=/!!}\s*/ contains=@phpClTop containedin=ALLBUT,bladeComment +syn region bladeEscapedEcho matchgroup=bladeEchoDelim start=/@\@<!\s*{{{\@!/ end=/}}\s*/ contains=@phpClTop containedin=ALLBUT,bladeComment +syn region bladeEscapedEcho matchgroup=bladeEchoDelim start=/@\@<!\s*{{{{\@!/ end=/}}}/ contains=@phpClTop containedin=ALLBUT,bladeComment " Structures syn match bladeStructure /\s*@\(else\|empty\|endfor\|endforeach\|endforelse\|endif\|endpush\|endsection\|endunless\|endwhile\|overwrite\|show\|stop\)\>/