Commit Graph

3444 Commits

Author SHA1 Message Date
David Bürgin
af4b0a76a7 vim-patch:7.4.587 #2622
Problem:    Conceal does not work properly with 'linebreak'. (cs86661)
Solution:   Save and restore boguscols. (Christian Brabandt)

https://github.com/vim/vim/commit/v7-4-587
2015-05-13 03:15:52 -04:00
Justin M. Keyes
6a1d89462b Merge #2623 'vim-patch:7.4.577' 2015-05-13 03:10:25 -04:00
David Bürgin
5e1d52a708 Passing by: regexp_nfa.c: Convert add_here variable to bool 2015-05-13 03:10:25 -04:00
David Bürgin
de6b3fbb15 vim-patch:7.4.577
Problem:    Matching with a virtual column has a lot of overhead on very long
            lines. (Issue 310)
Solution:   Bail out early if there can't be a match. (Christian Brabandt)
            Also check for CTRL-C at every position.

https://github.com/vim/vim/commit/v7-4-577

See also https://code.google.com/p/vim/issues/detail?id=310

Slightly adapted due to the long_u refactoring in
2ceb1c74d5.
2015-05-13 03:10:24 -04:00
David Bürgin
2498314876 vim-patch:7.4.581: Mark as NA #2624
Problem:    Compiler warnings for unitinialized variables. (John Little)
Solution:   Initialize the variables.

https://github.com/vim/vim/commit/v7-4-581

Not applicable. Depended on patch 7.4.560, which was NA, see #1743.
2015-05-11 21:27:46 -04:00
John Szakmeister
7ff582f86c Merge pull request #2616 from jszakmeister/update-busted-dependencies
build: update dependencies for busted
2015-05-11 07:04:41 -04:00
John Szakmeister
f0ab7c2ec1 third-party: use the official jemalloc tarball
This avoids messages to stderr about VERSION being missing, and allows
us to skip the autogen step.
2015-05-11 07:02:47 -04:00
Björn Linse
208013ae39 test/terminal: fix indeterminism in colorcolumn screen test
Previously, the screen test was expecting the screen state to be
identical to the previous screen test in `thelpers.screen_setup()`,
which is indeterministic. (The later screen test can accidentally
still see the previous identical state). The solution is to add a test
for a intermediate different state.
2015-05-10 20:18:46 +02:00
Clinton McKay
89d0e23624 test/ui: Add concealing tests. #2055 2015-05-09 17:21:54 +02:00
Yamakaky
48bd94e98f vim-patch:7.4.606 #2594
Problem:    May crash when using a small window.
Solution:   Avoid dividing by zero. (Christian Brabandt)

https://github.com/vim/vim/commit/v7-4-606
2015-05-09 10:56:05 -04:00
Ewan Hemingway
d956535307 vim-patch:7.4.576 #2595
Problem:    Redrawing problem with 'relativenumber' and 'linebreak'.
Solution:   Temporarily reset 'linebreak' and restore it in more places.
	    (Christian Brabandt)

https://github.com/vim/vim/commit/v7-4-576

Closes #1946
2015-05-09 10:46:12 -04:00
David Bürgin
96997fffbd vim-patch:7.4.524 #2559
Problem:    When using ":ownsyntax" spell checking is messed up. (Issue 78)
Solution:   Use the window-local option values. (Christian Brabandt)

https://github.com/vim/vim/commit/v7-4-524

See also https://code.google.com/p/vim/issues/detail?id=78
2015-05-09 10:23:23 -04:00
John Szakmeister
765b478b5e third-party: update a couple busted dependencies to newer versions 2015-05-09 09:38:55 -04:00
John Szakmeister
be70f0d2e6 third-party: update dependencies for busted
We didn't have ansicolors pegged, and several others were below the
minimum required versions causing busted to go out and grab newer
versions anyways.  Let's peg them all to useful versions.
2015-05-09 09:38:48 -04:00
John Szakmeister
d3a57b9b0b Fix a wrong expectation for vim_FullName() and FullName_save().
It's the second argument, buf, that cannot be NULL.  fname is allowed to
be NULL.  The issue only showed up on the release build when trying to
use NULL for fname and the test would segfault unexpectedly (because the
NULL check for fname was being optimized out due to the function
attributes).

FullName_save() also incorrectly assumes that fname cannot be NULL
(possibly because of the attribute on vim_FullName), so fix that site as
well.  This didn't have a corresponding test, so it wasn't visible as
test breakage, but did generate a tautological comparison warning in the
release build under Clang.
2015-05-09 09:28:38 -04:00
John Szakmeister
d00558bbdb build: create prereq targets for test dependencies
This will help make sure that we build all the right prereqs before
manually running tests under QuickBuild.

Notice that shell-test has been added as a prereq for the functional
tests, since it's a requirement for testing the terminal features.
2015-05-09 09:24:07 -04:00
Björn Linse
bcfc559395 os/input.c: Eliminate conversion warning from gcc 5 #2617 2015-05-09 11:28:25 +02:00
David Bürgin
001209a2fe 'cpoptions': Remove "*" flag #2554
The "*" flag in 'cpoptions' makes the command :* execute the contents of
a register. Removed because
  1. the same functionality exists as :@
  2. it hides :* as a useful command-line shortcut for :'<,'>
  3. unlike :@ it cannot be used with the * register

Helped-by: Michael Reed <m.reed@mykolab.com>
2015-05-08 17:46:54 -04:00
Rui Abreu Ferreira
1721e115b4 Require pkg-config to build bundled libtermkey #2606
Libtermkey can be linked against unibilium or curses. For the bundled
dependencies Neovim links against static versions of libtermkey and
unibilium, after building both libraries.

However libtermkey requires pkg-config to be installed in order to detect
and link against unibilium, otherwise it falls back to curses by default.
In systems where pkg-config is not installed building Neovim against the
bundled libtermkey caused a linking error (#2484).

So pkg-config needs to be installed for the bundled libtermkey to build
properly.
2015-05-08 16:14:15 -04:00
Michael Reed
de58eafd11 Merge pull request #2608 from yagebu/docs-cleanup
[RFC] Docs cleanup: Mark 'macatsui' option as removed, cleanup todo.txt.
2015-05-08 15:35:50 -04:00
Jakob Schnitzer
da2cd84a4d doc: remove GUI-related comments/bugs from todo.txt 2015-05-08 11:57:41 +02:00
Jakob Schnitzer
dbf68da698 doc: mark macatsui option as removed, update vim_diff.txt
This option has already been removed in the source.

Nvim does not have a GUI, so `nvim -g` does not work.
Also add `macatsui` to the list of removed options.
2015-05-08 11:57:41 +02:00
Michael Reed
0d90b5c36c Update to libuv 1.5.0 #2604
Contains some Windows-specific fixes:
https://github.com/libuv/libuv/pull/329

https://github.com/libuv/libuv/releases/tag/v1.5.0
2015-05-08 03:31:36 -04:00
Michael Reed
1978d65bca Merge pull request #2587 from mkfifo/master
[RFC] fixing 2 occurrences of incorrect usage of sizeof

Reviewed-by: Scott Prager <splinterofchaos@gmail.com>
Reviewed-by: oni-link <knil.ino@gmail.com>
Reviewed-by: Michael Reed <m.reed@mykolab.com>
2015-05-07 20:08:31 -04:00
Chris Hall
7fc7147ad6 coverity/62618: fixing "Wrong sizeof argument"
suspicious_sizeof: Passing argument 168UL /* sizeof (ufunc_T) */ * todo
to function xmalloc and then casting the return value to ufunc_T ** is
suspicious.
2015-05-08 10:08:53 +12:00
Chris Hall
2393074d5f coverity/109019: fixing "Sizeof not portable"
suspicious_sizeof: Passing argument 8UL /* sizeof (char const **) */ to
function xcalloc and then casting the return value to char ** is
suspicious.

In this particular case sizeof (char const **) happens to be
equal to sizeof (char const *), but this is not a portable as
2015-05-08 10:08:23 +12:00
Yamakaky
0b03399b8b refactor: remove USR_VIMRC_FILE4 #2580
It was 1) not used and 2) badly treated, compared to USR_VIMRC_FILE3.
2015-05-07 17:05:41 -04:00
Eliseo Martínez
f88cec8021 Merge #2470: Remove char_u (5)
Reviewed-by: Scott Prager <splinterofchaos@gmail.com>
Reviewed-by: Michael Reed <m.reed@mykolab.com>
Reviewed-by: Eliseo Martínez <eliseomarmol@gmail.com>
2015-05-07 08:08:31 +02:00
Bastian Winkler
a2cf628603 vim-patch:7.4.707 #2541
Problem:    Undo files can have their executable bit set.
Solution:   Strip of the executable bit. (Mikael Berthe)

https://github.com/vim/vim/commit/v7-4-707
2015-05-07 00:33:20 -04:00
David Bürgin
83a2a638a9 vim-patch:7.4.526 #2562
Problem:    matchstr() fails on long text. Daniel Hahler)
Solution:   Return NFA_TOO_EXPENSIVE from regexec_nl(). (Christian Brabandt)

https://github.com/vim/vim/commit/v7-4-526

Helped-by: Michael Reed <m.reed@mykolab.com>
2015-05-07 00:26:07 -04:00
Mark Bainter
2f60a69baf Update vim_FullName() to define fname as const 2015-05-06 21:34:19 -05:00
Mark Bainter
4ccf2740c8 Make fname const in path_get_absolute_path()
Also a minor change to remove an unneeded cast
2015-05-06 21:34:19 -05:00
Mark Bainter
a2273164b6 Refactor modname() to use add_pathsep
Based on splinterofchaos review
2015-05-06 21:34:19 -05:00
Mark Bainter
a56b09005a Passing by: wrap mb_ptr_adv(), mb_cptr_adv(), mb_ptr_back() macros in parenthesis. 2015-05-06 21:34:19 -05:00
Mark Bainter
7b35830fa4 Merge 'p' declaration with init in vim_version_dir() 2015-05-06 21:34:19 -05:00
Mark Bainter
bf2913bf74 Remove char_u: vim_settempdir() 2015-05-06 21:34:19 -05:00
Mark Bainter
c55e488079 Remove char_u: concat_fnames() 2015-05-06 21:34:19 -05:00
Mark Bainter
477b6a2c44 Remove char_u: make_percent_swname() 2015-05-06 21:25:05 -05:00
Mark Bainter
7774b97d57 Remove char_u: fix_fname() 2015-05-06 21:25:05 -05:00
Mark Bainter
80180bf94e Remove char_u: FullName_save() 2015-05-06 21:25:04 -05:00
Mark Bainter
657fd61973 Remove char_u: vim_FullName() 2015-05-06 21:25:04 -05:00
Mark Bainter
789c448d19 Remove char_u: path_with_url() 2015-05-06 21:25:04 -05:00
Mark Bainter
3128ff3798 Remove char_u: path_is_url() 2015-05-06 21:25:04 -05:00
Mark Bainter
1f76857232 Remove char_u: modname() 2015-05-06 21:25:04 -05:00
Mark Bainter
f813fdce38 Remove char_u: add_pathsep() 2015-05-06 21:25:04 -05:00
Yamakaky
dce0b98f80 vim-patch:7.4.590 #2592
Problem:    Using ctrl_x_mode as if it contains flags.
Solution:   Don't use AND with CTRL_X_OMNI. (Hirohito Higashi)

https://github.com/vim/vim/commit/v7-4-590

It was already included in neovim, see #2527.
2015-05-06 17:13:04 -04:00
David Bürgin
b6af1afee6 vim-patch:7.4.564 #2591
Problem:    FEAT_OSFILETYPE is used even though it's never defined.
Solution:   Remove the code. (Christian Brabandt)

https://github.com/vim/vim/commit/v7-4-564

Not applicable, this code has already been removed in Neovim. Included
some of the style tweaks.
2015-05-05 17:04:03 -04:00
Florian Walch
8337cd957e deps: Update lua-client. #2590 2015-05-05 23:29:22 +03:00
Rui Abreu Ferreira
8fcff0370c third-party: Update lua-xml to release 1.1.2 #2586 2015-05-05 15:37:51 -04:00
Daniel Hahler
2f2a29ed90 runtime/syntax/vim.vim: remove 'has("python")' checks #2589
This check does not appear to be required, but only causes the Python
provider to start.
2015-05-05 12:01:02 -04:00