Merge remote-tracking branch 'origin/master'

This commit is contained in:
Talia 2018-08-15 10:32:04 +02:00
commit 70e2149f81

2
vimrc
View file

@ -664,7 +664,7 @@ vnoremap <C-CR> ""y<CR>
\ :call setreg("\"", substitute(getreg("\""), "\n", "", ""), "v")<CR> \ :call setreg("\"", substitute(getreg("\""), "\n", "", ""), "v")<CR>
\ :<C-r>"<CR>`< \ :<C-r>"<CR>`<
let $LUA_PATH = $LUA_PATH.";".expand("<sfile>:p:h")."/lua/?.lua" let $LUA_PATH = system("lua -e 'print(package.path)'").";".expand("<sfile>:p:h")."/lua/?.lua"
let g:mooncompile = "!moonc ".expand("<sfile>:p:h")."/lua" let g:mooncompile = "!moonc ".expand("<sfile>:p:h")."/lua"
command! Mooncompile silent exec g:mooncompile command! Mooncompile silent exec g:mooncompile
let g:exe_prg = "moonc -- \| lua -l vim -" let g:exe_prg = "moonc -- \| lua -l vim -"