aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge pull request #1648 from Pyrohh/amiga-vms-cleanupJustin M. Keyes2014-12-19
|\ \ | | | | | | Amiga/VMS cleanup
| * | Remove Amiga remnantsMichael Reed2014-12-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | Notes regarding the removal of specific items: - Aztec C: only on the Amiga. - mch_check_win(): doesn't exist anymore. - Comment in ex_cmds.c: It seems the context for this comment was removed, but the comment was inadvertantly left alone.
| * | Remove dec-mcs remnantsMichael Reed2014-12-19
| | | | | | | | | | | | | | | It was (apparently) the default character encoding file used for line printing on VMS, which is unsupported.
| * | Remove VMS remnantsMichael Reed2014-12-19
|/ /
* | Merge pull request #1707 from fwalch/na-patchesJustin M. Keyes2014-12-19
|\ \ | | | | | | vim-patch: Mark patches as NA.
| * | vim-patch: Mark patches as NA.Florian Walch2014-12-19
|/ /
* | Merge pull request #1663 from philix/array_sizeJustin M. Keyes2014-12-19
|\ \ | | | | | | Define and use the ARRAY_SIZE macro
| * | Change the signature of utf_convert() (mbyte.c) to use ARRAY_SIZEFelipe Oliveira Carvalho2014-12-18
| | |
| * | Change the signature of intable() (mbyte.c) to use ARRAY_SIZEFelipe Oliveira Carvalho2014-12-18
| | |
| * | Use ARRAY_SIZE where Coccinelle wasn't able to do itFelipe Oliveira Carvalho2014-12-18
| | |
| * | Define and use the ARRAY_SIZE macroFelipe Oliveira Carvalho2014-12-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A similar macro is defined in the Linux kernel [1]. To refactor the code I used a slightly modified Coccinelle script I found in [2]. ```diff // Use the macro ARRAY_SIZE when possible // // Confidence: High // Copyright: (C) Gilles Muller, Julia Lawall, EMN, DIKU. GPLv2. // URL: http://www.emn.fr/x-info/coccinelle/rules/array.html // Options: -I ... -all_includes can give more complete results @@ type T; T[] E; @@ - (sizeof(E)/sizeof(*E)) + ARRAY_SIZE(E) @@ type T; T[] E; @@ - (sizeof(E)/sizeof(E[...])) + ARRAY_SIZE(E) @@ type T; T[] E; @@ - (sizeof(E)/sizeof(T)) + ARRAY_SIZE(E) @n@ identifier AS,E; @@ - #define AS(E) ARRAY_SIZE(E) @@ expression E; identifier n.AS; @@ - AS(E) + ARRAY_SIZE(E) ``` `spatch --in-place --sp-file array_size.cocci -I src/ -I build/include/ -I build/src/nvim/auto/ src/nvim/*.c` [1] http://lxr.free-electrons.com/source/include/linux/kernel.h#L54 [2] http://www.emn.fr/z-info/coccinelle/rules/#macros
* | | Merge pull request #1704 from fwalch/vim-7.4.434Justin M. Keyes2014-12-19
|\ \ \ | | | | | | | | vim-patch:7.4.434, vim-patch:7.4.442
| * | | vim-patch:7.4.442Florian Walch2014-12-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: Using unitinialized variable. Solution: Pass the first window of the tabpage. https://code.google.com/p/vim/source/detail?r=v7-4-442
| * | | vim-patch:7.4.434Florian Walch2014-12-18
| |/ / | | | | | | | | | | | | | | | | | | | | | Problem: gettabvar() is not consistent with getwinvar() and getbufvar(). Solution: Return a dict with all variables when the varname is empty. (Yasuhiro Matsumoto) https://code.google.com/p/vim/source/detail?r=v7-4-434
* | | Merge pull request #1638 from Grimy/ex-dropJustin M. Keyes2014-12-19
|\ \ \ | | | | | | | | Reimplement :drop
| * | | Reimplement :drop (vim-patch:0)Victor Adam2014-12-18
| | | | | | | | | | | | | | | | | | | | The :drop ex command was inadvertently removed when removing FEAT_GUI. This patch reintroduces it.
* | | | Merge pull request #1699 from three-comrades/fix-viminfoJustin M. Keyes2014-12-19
|\ \ \ \ | |_|/ / |/| | | Use a local viminfo file when running the old tests.
| * | | Remove superfluous settings from legacy tests.Julian Mehne2014-12-18
| | | |
| * | | Use a local viminfo file when running the old tests.Julian Mehne2014-12-17
| | | | | | | | | | | | | | | | | | | | This is required after defaulting to `nocp`, so that ~/.nviminfo files don't interfere with the old legacy tests.
* | | | Merge pull request #1701 from fwalch/vim-7.4.423Justin M. Keyes2014-12-18
|\ \ \ \ | | | | | | | | | | vim-patch:7.4.423
| * | | | vim-patch:7.4.423Florian Walch2014-12-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: expand("$shell") does not work as documented. Solution: Do not escape the $ when expanding environment variables. https://code.google.com/p/vim/source/detail?r=v7-4-423
* | | | | Merge pull request #1702 from fwalch/update-bustedJustin M. Keyes2014-12-18
|\ \ \ \ \ | |/ / / / |/| | | | Update busted to 2.0.rc4.
| * | | | Update busted to 2.0.rc4.Florian Walch2014-12-18
|/ / / /
* | | | Merge pull request #1588 from equalsraf/tb-no-central-depsJohn Szakmeister2014-12-18
|\ \ \ \ | | | | | | | | | | Dont force ../.deps in third-party/CMakeLists.txt use the Makefile instead
| * | | | Allow cmake caller to override DEPS_PREFIXRui Abreu Ferreira2014-12-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Caller can override bundled dependency location using DEPS_PREFIX - Cache variable DEPS_PREFIX, using .deps/usr by default - Removed unused variables DEPS_BIN_DIR, DEPS_BUILD_DIR, DEPS_DIR DEPS_INSTALL_DIR - Corner case: if the caller tries to override DEPS_PREFIX after a successful cmake configuration, the caller needs to clear the cache because dependency checks are based on the old value
| * | | | Dont force ../.deps in third-party/CMakeLists.txtRui Abreu Ferreira2014-12-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - third-party is built under .deps by default instead of using its own ${CMAKE_BINARY_DIR}, move this default setting out of the cmake settings and into the Makefile. - As a consequence the workflow of building third-party using CMake should feel more natural, avoid the additional folder or setting DEPS_DIR from the command line. - This commit does not change the default behaviour when calling the Makefile wrapper.
* | | | | Merge pull request #1686 from jszakmeister/include-opts-in-fortify-checkJohn Szakmeister2014-12-18
|\ \ \ \ \ | | | | | | | | | | | | build: include the flags for the build type in the _FORTIFY_SOURCE check
| * | | | | build: include the flags for the build type in the _FORTIFY_SOURCE checkJohn Szakmeister2014-12-16
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out the check was being performed without optimizations enabled even when the CMAKE_BUILD_TYPE was set to a release build. This led to _FORTIFY_SOURCE's level not being correctly determined, and us failing to apply the correct workaround. To counter this, we'll take the default flags for the build type and apply them. Also, if options are passed via CFLAGS, they are automatically passed on to the underlying build. So this should cover all the necessary ground. This fixes #1647.
* | | | | Merge pull request #1654 from gaurdro/rpm-fortify_sourceJohn Szakmeister2014-12-18
|\ \ \ \ \ | |_|_|/ / |/| | | | [RFC] Fix issue 1569: Build fails in rpmbuild environment
| * | | | Detect and propagate _FORTIFY_SOURCE prefixRoss Smith2014-12-17
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get prefix to a -D_FORTIFY_SOURCE string if it is present in CFLAGS and apply the prefix to flags added to redefine _FORTIFY_SOURCE in CFLAGS and CPPFLAGS * fixes 1569
* | | | Merge pull request #1698 from elmart/clang-analysis-fixes-6Justin M. Keyes2014-12-17
|\ \ \ \ | |_|/ / |/| | | Fix clang analysis warnings. (6)
| * | | Fix warnings: window.c: win_close_othertab(): Np dereference: FP.Eliseo Martínez2014-12-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem : Dereference of null pointer @ 1980. Diagnostic : False positive. Rationale : I haven't been able to find the real reason why this is signaled. Nonetheless, I've been able to track down the introduction of this warning to commit 77135447e09903b45d1482da45869946212f7904. The change there affecting this function is just a transformation maintaining semantics. So, this must be a FP, though I can't explain why. Analyzer thinks `win->w_buffer` can be null in line 1980, following an error path assuming win->w_buffer null at line 1819. Given that `win_close` function was not modified by mentioned commit, I don't understand why this path is analyzed after the changes, but not before them. Or if it's analyzed, why it's discarded before changes but not after them. I don't see anything in changes to `close_last_window_tabpage` that should affect to being able to deduce `win->w_buffer` is not null. Resolution : Assert buffer not null in `win_close_othertab`. Function comments state that passed window should have a buffer that can be hidden, which implies there should be a buffer. Reverting changes to `close_last_window_tabpage` in mentioned commit would be another way to fix this (tried and worked). But assert is preferred in this case because flat style reads better and we have some other way to fix it.
| * | | Fix warnings: syntax.c: get_id_list(): Double free: FP.Eliseo Martínez2014-12-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem : Double free @ 5213. Diagnostic : False positive. Rationale : I haven't been able to find the real reason why this is signaled. Nonetheless, I've been able to track down the introduction of this warning to commit 77135447e09903b45d1482da45869946212f7904. The change there affecting this function is just a transformation maintaining semantics. So, this must be a FP, though I can't explain why. Resolution : Revert changes in mentioned commmit touching this function.
| * | | Fix warnings: option.c: makeset()/put_setnum(): Various (3): FP.Eliseo Martínez2014-12-17
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problems : Dereference of null pointer @ 6251. Dereference of null pointer @ 6267. Dereference of null pointer @ 6351. Diagnostic : False positive. Rationale : Problems occur if varp is null after `varp = get_varp_scope(p, opt_flags);`. That can only happen if option is hidden. Those are options that can be set (for backwards compatibility reasons) but that do nothing (see `:h hidden-options`, `:h missing-options`). In particular, even if setting them is allowed, value is not stored, so these options have no real value. So, suggested error paths should not occur, as checks comparing option value and default value should discard them. Resolution : We could just `assert(varp)` before line 6235 `varp_local = varp;`. That was tried and worked. But we prefer modifying the code to explicitly skip hidden options. A redundant `!istermoption(p)` is removed too (it's already checked by for loop condition).
* | | Merge pull request #1688 from elmart/coverity-issues-1Justin M. Keyes2014-12-16
|\ \ \ | |_|/ |/| | coverity issues
| * | coverity/75594: Explicit null dereferenced: RI.Eliseo Martínez2014-12-16
| | | | | | | | | | | | | | | | | | | | | | | | Problem : Exlicit null dereferenced (FORWARD NULL) @ 2859. Diagnostic : Real issue. Rationale : Code within `if (!p_bk)` seems to assume `backup` not null at that point, which may not be true. Resolution : Don't enter conditional on null `backup`.
| * | Passing-by: Fix FALSE/FAIL confusion.Eliseo Martínez2014-12-16
| | | | | | | | | | | | | | | | | | FALSE was being used instead of FAIL. They happen to have the same value, so it works the same. But from function comment it's clear it uses the OK/FAIL convention.
| * | coverity/13696: Unchecked return value: RI.Eliseo Martínez2014-12-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem : Unchecked return value (CHECKED_RETURN) @ 2644. Diagnostic : Real issue. Rationale : Other `u_save` invocations are checked, and there's no reason to think this invocation could not fail. Resolution : Check and return if failed (other previous checks in the same function just return, without reporting error, so we just do the same).
| * | coverity/13695: Unchecked return value: RI.Eliseo Martínez2014-12-16
|/ / | | | | | | | | | | | | | | | | Problem : Unchecked return value (CHECKED_RETURN) @ 8554. Diagnostic : Real issue. Rationale : Other invocations of `do_source` are checked and generate an error message if fail. There seems to be no reason why this particular instance could not fail the same. Resolution : Check invocation and generate error message on failure.
* | Merge pull request #1679 from oni-link/fix.clang.warningJustin M. Keyes2014-12-15
|\ \ | | | | | | Fix for clang analyzer warning in ops.c
| * | Fix warning: ops.c: read_viminfo_register(): Dereference of null pointer: RI.oni-link2014-12-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem : Array access (via field 'y_array') results in a null pointer dereference @ 4487. Diagnostic : Real issue. Rationale : If the array was previously freed and the size of the array (y_current->y_size) was not updated to zero, the loop @4486 could be entered and a NULL pointer would be dereferenced. Resolution : Use free_yank_all() to take care of the NULL check and to free the current yank register.
* | | Merge pull request #1677 from philix/dpelle-constifyJustin M. Keyes2014-12-15
|\ \ \ | |/ / |/| | add 'const' where possible: mbyte.c (rebase of #268)
| * | Little by little add 'const' were possible: mbyte.cDominique Pelle2014-12-15
| |/
* | Merge pull request #1676 from fwalch/na-patchesJustin M. Keyes2014-12-15
|\ \ | |/ |/| vim-patch: Mark patches as NA.
| * vim-patch: Mark patches as NA.Florian Walch2014-12-15
|/
* Merge pull request #1666 from elmart/vim-patch-7.4.543Justin M. Keyes2014-12-14
|\ | | | | vim-patch:7.4.543.
| * vim-patch:7.4.543.Eliseo Martínez2014-12-15
|/ | | | | | | | | | | Adapt #1533 and #1596 to conform to upstream patch (https://groups.google.com/forum/#!topic/vim_dev/vp0Lwo9f56s). Problem: Since patch 7.4.232 "1,3s/\n//" joins two lines instead of three. (Eliseo Martínez) Issue 287 Solution: Correct the line count. (Christian Brabandt) Also set the last used search pattern.
* Merge pull request #1570 from fwalch/travis-improvementsJustin M. Keyes2014-12-14
|\ | | | | Travis-related improvements
| * Travis: Remove setting core file size.Florian Walch2014-12-14
| | | | | | | | | | | | Doesn't work on Travis: > bash: line 0: ulimit: core file size: cannot modify limit: Operation not permitted
| * Travis: Simplify clint script.Florian Walch2014-12-14
| |