aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2017-04-10 22:21:06 +0300
committerZyX <kp-pav@yandex.ru>2017-04-10 22:21:06 +0300
commitab4d13e2fa09db538756cc5cfb36f81681e5ff7a (patch)
treeb8bded415655f09bc323a23d21ed8d7e74b1c8da
parenta40a969e9a4776f1e274dcf0e59c8f1ec1770ca0 (diff)
parent9aface8c4d1edd25d4fed3e099e3c2c02b0a282a (diff)
downloadrneovim-ab4d13e2fa09db538756cc5cfb36f81681e5ff7a.tar.gz
rneovim-ab4d13e2fa09db538756cc5cfb36f81681e5ff7a.tar.bz2
rneovim-ab4d13e2fa09db538756cc5cfb36f81681e5ff7a.zip
Merge branch 'master' into luaviml'/lua
-rw-r--r--.travis.yml7
-rw-r--r--CMakeLists.txt1
-rw-r--r--appveyor.yml2
-rw-r--r--busted/outputHandlers/nvim.lua305
-rwxr-xr-xci/before_cache.sh5
-rw-r--r--ci/build.bat2
-rw-r--r--ci/common/suite.sh68
-rw-r--r--ci/common/test.sh62
-rwxr-xr-xci/run_lint.sh5
-rwxr-xr-xci/run_tests.sh6
-rw-r--r--cmake/InstallClintErrors.cmake2
-rw-r--r--runtime/doc/eval.txt13
-rw-r--r--runtime/doc/options.txt4
-rw-r--r--runtime/doc/starting.txt24
-rw-r--r--src/nvim/CMakeLists.txt41
-rw-r--r--src/nvim/charset.c69
-rw-r--r--src/nvim/cursor_shape.h3
-rw-r--r--src/nvim/digraph.h3
-rw-r--r--src/nvim/edit.c25
-rw-r--r--src/nvim/eval.c41
-rw-r--r--src/nvim/eval.lua2
-rw-r--r--src/nvim/eval/decode.c24
-rw-r--r--src/nvim/eval/encode.c55
-rw-r--r--src/nvim/ex_cmds.h2
-rw-r--r--src/nvim/ex_getln.c4
-rw-r--r--src/nvim/ex_getln.h3
-rw-r--r--src/nvim/file_search.c2
-rw-r--r--src/nvim/file_search.h5
-rw-r--r--src/nvim/fold.h5
-rw-r--r--src/nvim/hardcopy.h4
-rw-r--r--src/nvim/iconv.h4
-rw-r--r--src/nvim/if_cscope.h3
-rw-r--r--src/nvim/macros.h2
-rw-r--r--src/nvim/mark.h1
-rw-r--r--src/nvim/mbyte.c31
-rw-r--r--src/nvim/mbyte.h1
-rw-r--r--src/nvim/memfile_defs.h2
-rw-r--r--src/nvim/memline.h2
-rw-r--r--src/nvim/menu.h5
-rw-r--r--src/nvim/message.c6
-rw-r--r--src/nvim/move.h2
-rw-r--r--src/nvim/ops.c27
-rw-r--r--src/nvim/ops.h2
-rw-r--r--src/nvim/path.c6
-rw-r--r--src/nvim/regexp.c45
-rw-r--r--src/nvim/regexp_nfa.c32
-rw-r--r--src/nvim/search.c25
-rw-r--r--src/nvim/shada.c230
-rw-r--r--src/nvim/spell.c44
-rw-r--r--src/nvim/spell_defs.h4
-rw-r--r--src/nvim/spellfile.c156
-rw-r--r--src/nvim/strings.c51
-rw-r--r--src/nvim/syntax.c124
-rw-r--r--src/nvim/tag.c20
-rw-r--r--src/nvim/testdir/test_alot.vim1
-rw-r--r--src/nvim/testdir/test_functions.vim144
-rw-r--r--src/nvim/testdir/test_normal.vim34
-rw-r--r--src/nvim/testdir/test_taglist.vim58
-rw-r--r--src/nvim/undo.c15
-rw-r--r--src/nvim/vim.h17
-rw-r--r--test/config/paths.lua.in3
-rw-r--r--test/functional/api/buffer_spec.lua6
-rw-r--r--test/functional/api/server_notifications_spec.lua8
-rw-r--r--test/functional/api/server_requests_spec.lua4
-rw-r--r--test/functional/autocmd/autocmd_spec.lua26
-rw-r--r--test/functional/autocmd/bufenter_spec.lua3
-rw-r--r--test/functional/autocmd/textyankpost_spec.lua30
-rw-r--r--test/functional/clipboard/clipboard_provider_spec.lua86
-rw-r--r--test/functional/core/job_spec.lua12
-rw-r--r--test/functional/eval/api_functions_spec.lua22
-rw-r--r--test/functional/eval/glob_spec.lua4
-rw-r--r--test/functional/eval/json_functions_spec.lua103
-rw-r--r--test/functional/eval/modeline_spec.lua4
-rw-r--r--test/functional/eval/msgpack_functions_spec.lua149
-rw-r--r--test/functional/eval/reltime_spec.lua4
-rw-r--r--test/functional/eval/setpos_spec.lua9
-rw-r--r--test/functional/eval/special_vars_spec.lua6
-rw-r--r--test/functional/eval/system_spec.lua20
-rw-r--r--test/functional/eval/timer_spec.lua26
-rw-r--r--test/functional/ex_cmds/arg_spec.lua8
-rw-r--r--test/functional/ex_cmds/bang_filter_spec.lua4
-rw-r--r--test/functional/ex_cmds/cd_spec.lua54
-rw-r--r--test/functional/ex_cmds/ctrl_c_spec.lua6
-rw-r--r--test/functional/ex_cmds/drop_spec.lua22
-rw-r--r--test/functional/ex_cmds/edit_spec.lua9
-rw-r--r--test/functional/ex_cmds/encoding_spec.lua6
-rw-r--r--test/functional/ex_cmds/grep_spec.lua10
-rw-r--r--test/functional/ex_cmds/menu_spec.lua18
-rw-r--r--test/functional/ex_cmds/oldfiles_spec.lua22
-rw-r--r--test/functional/ex_cmds/recover_spec.lua18
-rw-r--r--test/functional/ex_cmds/syntax_spec.lua17
-rw-r--r--test/functional/ex_cmds/undojoin_spec.lua8
-rw-r--r--test/functional/ex_cmds/write_spec.lua15
-rw-r--r--test/functional/ex_cmds/wundo_spec.lua15
-rw-r--r--test/functional/ex_cmds/wviminfo_spec.lua12
-rw-r--r--test/functional/helpers.lua18
-rw-r--r--test/functional/legacy/002_filename_recognition_spec.lua12
-rw-r--r--test/functional/legacy/003_cindent_spec.lua1134
-rw-r--r--test/functional/legacy/004_bufenter_with_modelines_spec.lua21
-rw-r--r--test/functional/legacy/005_bufleave_delete_buffer_spec.lua27
-rw-r--r--test/functional/legacy/006_argument_list_spec.lua38
-rw-r--r--test/functional/legacy/007_ball_buffer_list_spec.lua32
-rw-r--r--test/functional/legacy/008_autocommands_spec.lua30
-rw-r--r--test/functional/legacy/009_bufleave_autocommand_spec.lua22
-rw-r--r--test/functional/legacy/011_autocommands_spec.lua60
-rw-r--r--test/functional/legacy/012_directory_spec.lua40
-rw-r--r--test/functional/legacy/015_alignment_spec.lua30
-rw-r--r--test/functional/legacy/018_unset_smart_indenting_spec.lua14
-rw-r--r--test/functional/legacy/019_smarttab_expandtab_spec.lua18
-rw-r--r--test/functional/legacy/020_blockwise_visual_spec.lua13
-rw-r--r--test/functional/legacy/021_control_wi_spec.lua11
-rw-r--r--test/functional/legacy/022_line_ending_spec.lua6
-rw-r--r--test/functional/legacy/023_edit_arguments_spec.lua34
-rw-r--r--test/functional/legacy/025_jump_tag_hidden_spec.lua24
-rw-r--r--test/functional/legacy/026_execute_while_if_spec.lua6
-rw-r--r--test/functional/legacy/028_source_ctrl_v_spec.lua6
-rw-r--r--test/functional/legacy/029_join_spec.lua68
-rw-r--r--test/functional/legacy/030_fileformats_spec.lua343
-rw-r--r--test/functional/legacy/031_close_commands_spec.lua66
-rw-r--r--test/functional/legacy/033_lisp_indent_spec.lua27
-rw-r--r--test/functional/legacy/034_user_function_spec.lua22
-rw-r--r--test/functional/legacy/035_increment_and_decrement_spec.lua12
-rw-r--r--test/functional/legacy/036_regexp_character_classes_spec.lua6
-rw-r--r--test/functional/legacy/038_virtual_replace_spec.lua12
-rw-r--r--test/functional/legacy/039_visual_block_mode_commands_spec.lua24
-rw-r--r--test/functional/legacy/041_writing_and_reading_hundred_kbyte_spec.lua25
-rw-r--r--test/functional/legacy/043_magic_settings_spec.lua21
-rw-r--r--test/functional/legacy/044_099_regexp_multibyte_magic_spec.lua34
-rw-r--r--test/functional/legacy/045_folding_spec.lua84
-rw-r--r--test/functional/legacy/051_highlight_spec.lua72
-rw-r--r--test/functional/legacy/054_buffer_local_autocommands_spec.lua32
-rw-r--r--test/functional/legacy/055_list_and_dict_types_spec.lua146
-rw-r--r--test/functional/legacy/057_sort_spec.lua146
-rw-r--r--test/functional/legacy/059_utf8_spell_checking_spec.lua242
-rw-r--r--test/functional/legacy/061_undo_tree_spec.lua46
-rw-r--r--test/functional/legacy/062_tab_pages_spec.lua69