aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* version.c: Mark vim-patches NAwatiko2016-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NA patch list: 892: (MS-Win, iconv) https://github.com/vim/vim/commit/9d6ca1cc5ebb6e61cc2ef73aecfbb0bdbb65432f 904: ({,g}vim.desktop) https://github.com/vim/vim/commit/6407b3e80d7d7f8f0797c13ae35cc06f96be46c9 https://github.com/vim/vim/commit/1d8d9c0bec84ac799a2f62a5ac81eade3eaf638a vim-patch:1d8d9c0bec84ac799a2f62a5ac81eade3eaf638a 905: (if_py_both) https://github.com/vim/vim/commit/d424747d5821c2873e24d25d3407d08b25ea3443 909: (src/Makefile) https://github.com/vim/vim/commit/de59ba33aa3b94f2757dbf3451682d762c15ebcf 914: (src/term.c, logical-not-parentheses) https://github.com/vim/vim/commit/98b30a473a58ae98c280e0383c8b1e08c0ebced5 943: (src/testdir/Makefile, test_writefile) https://github.com/vim/vim/commit/48a969b48898fb08dce636c6b918408c6fbd3ea0 947: (src/testdir/Make_ming.mak, Test_listchars) https://github.com/vim/vim/commit/5311c02f25eed8f34e8a80becb98e86264f371c3 956: (empty) Missing parts are in other runtime comitts. https://github.com/vim/vim/commit/f882d9f89dbe24ab1ba4bc88529bef28242fd2ed 969: (cast) HAVE_AVAIL_MEM was removed. https://github.com/vim/vim/commit/35be4534c029148a89ccc41e8e465d793e7ed7c2 993: (if_py_both) https://github.com/vim/vim/commit/52f6ae1366b34fc5771595c0bd17c779a7f6f544 Already merged patch list: vim-patch:35e7594dd429f7a8a06cefd61c3e8d48b9bd74e2 vim-patch:44132a10aeb45c957959cafb4ac39d3f478be98c vim-patch:974
* Merge pull request #4332 from Jun-T/editorconfigJustin M. Keyes2016-02-27
|\ | | | | .editorconfig
| * add .editorconfigJun T2016-02-23
| |
* | Avoid internal errors with setloclist()Marco Hinz2016-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | All syntastic users experienced this problem: E685: Internal error: get_tv_string_buf() It's reproducable with: :call setloclist(0, ['']) So, not given optional arguments to setloclist() lead to some fields not inizilied and the code took the wrong branches.
* | Merge pull request #4277 from Jun-T/lang2localeJustin M. Keyes2016-02-26
|\ \ | | | | | | build: install *.mo into the "standard" directory
| * | build: install *.mo into the "standard" directoryJun T2016-02-23
| | | | | | | | | | | | | | | | | | | | | Change POROJECT_NAME to 'nvim', and use it as the gettext domain name. The *.mo files, previously installed as $runtime/lang/xx/LC_MESSAGES/nvim.mo, are now installed as $prefix/locale/xx/LC_MESSAGES/nvim.mo.
* | | Merge pull request #4335 from HarmtH/update-docJustin M. Keyes2016-02-25
|\ \ \ | | | | | | | | Correct documention on order autocmds
| * | | Correct documention on order autocmdsHarm te Hennepe2016-02-23
| | | | | | | | | | | | | | | | | | | | The order of executed autocmds TabEnter and WinEnter is wrongly stated in the documentation. TabEnter is executed after WinEnter.
* | | | Merge pull request #4274 from DarkDefender/patch-1Justin M. Keyes2016-02-25
|\ \ \ \ | | | | | | | | | | Adjust terminal text color if it is bold
| * | | | Fix terminal true color bold colorsSebastian Parborg2016-02-23
| | | | | | | | | | | | | | | | | | | | Now the terminal should also correctly output true color codes
* | | | | Merge pull request #4346 from bfredl/minilintJustin M. Keyes2016-02-25
|\ \ \ \ \ | | | | | | | | | | | | build system: allow linting a single file and revert #4216
| * | | | | Revert "build system: avoid more unneccesary recompiles"Björn Linse2016-02-25
| | | | | | | | | | | | | | | | | | | | | | | | This was not the correct way to fix the issue.
| * | | | | cmake: allow linting a specific fileBjörn Linse2016-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For instance to only lint "edit.c" make lint LINT_FILE="src/nvim/edit.c"
* | | | | | Merge PR #4337 'Make set{qf,loc}list() take {title}'Marco Hinz2016-02-25
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Tests: add errorlist_spec.luaMarco Hinz2016-02-25
| | | | | |
| * | | | | Make set{qf,loc}list() take {title}Marco Hinz2016-02-25
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an extra argument to these functions to set w:quickfix_title. This is a modified version of a patch from vim_dev. Discussion here: https://groups.google.com/forum/#!topic/vim_dev/X7VVPd4Do5s Credits go to Christian "chrisbra" Brabandt and Daniel "blueyed" Hahler.
* | | | | Merge pull request #4339 from philix/fix-undo-diagramJustin M. Keyes2016-02-24
|\ \ \ \ \ | | | | | | | | | | | | Fix the ASCII-art diagram in undo.c
| * | | | | Fix the ASCII-art diagram in undo.cFelipe Oliveira Carvalho2016-02-24
| | | | | | | | | | | | | | | | | | | | | | | | Set \t to 8 spaces and `retab`.
* | | | | | Tests: fix according to lualintMarco Hinz2016-02-24
| | | | | |
* | | | | | Merge pull request #1817 from bfredl/bufmatchBjörn Linse2016-02-23
|\ \ \ \ \ \ | | | | | | | | | | | | | | support buffer-associated highlighting by external plugins
| * | | | | | docs: start api docs and document highlight mechanismBjörn Linse2016-02-23
| | | | | | |
| * | | | | | bufhl: fix unittests and lintBjörn Linse2016-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | msgpack_rpc_dispatch doesn't exist anymore
| * | | | | | bufhl: add tests for adding and clearing highlightsBjörn Linse2016-02-23
| | | | | | |
| * | | | | | bufhl: new mechanism for plugins to add highlights to a bufferBjörn Linse2016-02-23
|/ / / / / /
* | | | | | Merge pull request #4327 from ffleming/coverity-71530Justin M. Keyes2016-02-23
|\ \ \ \ \ \ | |/ / / / / |/| | | | | coverity/71530: Prefer STRLCPY to STRCPY in option.c
| * | | | | coverity/71530: Prefer STRLCPY to STRCPY in option.cForrest Fleming2016-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses Coverity CID 71530 Prefer sizeof(NameBuff) Add braces for Travis lint Break long line Properly align parameters in multi-line function call
* | | | | | Merge pull request #4329 from justinmk/libuvJustin M. Keyes2016-02-23
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update to libuv 1.8.0
| * | | | | | Update to libuv 1.8.0Justin M. Keyes2016-02-22
| |/ / / / /
* | | | | | Merge pull request #4064 from oni-link/cs_print_tags_privJustin M. Keyes2016-02-23
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix some problems with cs_print_tags_priv()
| * | | | | cs_print_tags_priv: Clean up function.oni-link2016-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Style changes * Variable removal * Comment update
| * | | | | cs_print_tags_priv: Clear first output line to screen endoni-link2016-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using `:cscope find s <cword>` with the cursor on a very short word like `key` does not output the first line on the screen correctly: Output is `Cscope tag: keyrd>` instead of `Cscope tag: key`. To fix this, clear the screen line after the first line was printed.
| * | | | | coverity/133892: Resource leakoni-link2016-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Variable tbuf going out of scope leaks the storage it points to. We don't have to use the copy tbuf of a match. Because matches are always in ctags style, we can operate on them directly.
| * | | | | coverity/133858: Out-of-bounds accessoni-link2016-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allocating insufficient memory for the terminating NUL of the string. False positive, we allocating more memory than we need.
| * | | | | coverity/13753: Dereference null return valueoni-link2016-01-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dereferencing a pointer that might be null(ptag) when calling strlen(). False positive. A match always contains a tab, so ptag is never null. Because matches are always in ctags style, we can rewrite the code to not use strtok().
* | | | | | Merge pull request #4330 from justinmk/set_vim_var_dictJustin M. Keyes2016-02-23
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | set_vim_var_dict: Allow NULL `val`.
| * | | | | set_vim_var_dict: Allow NULL `val`.Justin M. Keyes2016-02-23
|/ / / / / | | | | | | | | | | | | | | | Closes #3006
* | | | | Merge pull request #4328 from justinmk/coverityJustin M. Keyes2016-02-23
|\ \ \ \ \ | |_|/ / / |/| | | | coverity/71532: STRING_OVERFLOW
| * | | | coverity/71532: STRING_OVERFLOWJustin M. Keyes2016-02-22
|/ / / /
* | | | Merge pull request #4315 from justinmk/compl_flickerJustin M. Keyes2016-02-22
|\ \ \ \ | | | | | | | | | | completion: Avoid flicker
| * | | | ins_complete: Avoid semi-global state.Justin M. Keyes2016-02-22
| | | | |
| * | | | completion: Avoid flicker.Shougo Matsushita2016-02-21
| | | | |
* | | | | Merge pull request #4318 from lucc/legacy_test_makefileJustin M. Keyes2016-02-22
|\ \ \ \ \ | | | | | | | | | | | | test: Reformat legacy test makefile.
| * | | | | test: Reformat legacy test makefile.Lucas Hoffmann2016-02-22
|/ / / / / | | | | | | | | | | | | | | | | | | | | This will hopefully reduce the number of merge conflicts when merging the outstanding legacy test migrations.
* | | | | Merge pull request #4317 from justinmk/superkeyJustin M. Keyes2016-02-22
|\ \ \ \ \ | | | | | | | | | | | | keymap: Support <D-...> (super/command key).
| * | | | | keymap: Support <D-...> (super/command key).Justin M. Keyes2016-02-22
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for: - api:vim_input("<D-a>") - ":nnoremap <C-D-S-...>" and permutations thereof UIs must capture the modifier and send it as "<D-...>" to vim_input(). Note: Before this commit, any arbitrary ":nnoremap <{foo}-{bar}>" mapping could already be invoked with feedkeys("\<{foo}-{bar}>"). This commit supports "D-" as a modifier that can be combined with "C-", "A-", "S-" in any order. For non-GUI (terminal) support, user must: :set <D-a>={CSI sequence} then send the {CSI sequence} from their terminal. But this does not work yet (regression #2204). Closes #2190
* | | | | vim-patch:7.4.936 #4271watiko2016-02-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: Crash when dragging with the mouse. Solution: Add safety check for NULL pointer. Check mouse position for valid value. (Hirohito Higashi) https://github.com/vim/vim/commit/294a7e55b01149154807a23323038784549b8946 --- see: "Crash while mouse-selecting in two-buffer mode" https://github.com/vim/vim/issues/486 Fix #3704
* | | | | Merge pull request #4272 from watiko/vim-7.4.937Justin M. Keyes2016-02-22
|\ \ \ \ \ | | | | | | | | | | | | vim-patch:7.4.937
| * | | | | vim-patch:7.4.937watiko2016-02-17
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: Segfault reading unitialized memory. Solution: Do not read match \z0, it does not exist. (Marius Gedminas, closes vim/vim#497) https://github.com/vim/vim/commit/5ad075c0735d3d8b97708d17c22de8facb15f997
* | | | | Merge pull request #4267 from watiko/vim-7.4.932Justin M. Keyes2016-02-22
|\ \ \ \ \ | | | | | | | | | | | | vim-patch:7.4.{926,932,933}
| * | | | | version.c: Mark 7.4.935 NAwatiko2016-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: test_utf8 fails on MS-Windows when executed with gvim. Solution: Use the insert flag on feedkeys() to put the string before the ":" that was already read when checking for available chars. https://github.com/vim/vim/commit/6040256d8b0404564ac6f192296b12ea9d175e7d --- feedkeys() is not used by legacy test utf8.