Commit Graph

3519 Commits

Author SHA1 Message Date
Florian Walch
a822118e64 Merge #2495 'third-party dependencies for Windows'. 2015-05-15 17:55:02 +03:00
Rui Abreu Ferreira
43c767ba78 AppVeyor: MSVC builds for third-party/ 2015-05-15 17:55:02 +03:00
Rui Abreu Ferreira
f65614fb1c Travis: Add Mingw third-party builds
- Build third-party/ in Travis using mingw
- Import mingw-w64 cmake toolchain
2015-05-15 17:55:02 +03:00
Rui Abreu Ferreira
cca32e64cc CMake: Build third-party deps in Windows
- Update recipes to build with MSVC or cross compile in Unix with Mingw
- For recipes that need to be reused, wrap recipe in CMake function
  using cmake_parse_arguments
- New directory .deps/host is the install root for HOST targets, the old
  .deps/usr is used for TARGET
- In windows disable builds for terminal libraries and jemalloc
- Added cmake script CopyFilesGlob.cmake to copy files using glob
    cmake -DFROM_GLOB=*.h -DTO=/usr/include -P CopyFilesGlob.cmake
- New CMake variables HOSTDEPS_* can be used in cross compile recipes.
  Except when the target is UNIX, since that would break 32bit builds
  in 64bit Unix systems using the Travis 32bit toolchain
2015-05-15 17:55:01 +03:00
Rui Abreu Ferreira
73dbd14283 CMake: Dont search for Make in Windows 2015-05-15 17:55:01 +03:00
Michael Reed
8814e275cf Merge pull request #2643 from glts/mark-na-patches
[RFC] vim-patch: Mark patches as NA
2015-05-14 15:12:25 -04:00
David Bürgin
eaf937ff2c vim-patch:7.4.{592,596,632}: Mark as NA
Original commit message for patch 7.4.592:

Problem:    When doing ":e foobar" when already editing "foobar" and 'buftype'
            is "nofile" the buffer is cleared. (Xavier de Gaye)
Solution:   Do no clear the buffer.

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

The change in this patch was amended in patch 7.4.596 to fix an #ifdef
problem, but soon after, in patch 7.4.632, it was reverted wholesale.

See https://groups.google.com/d/msg/vim_dev/SWw5znc3W-8/TDjkUVYfABIJ
2015-05-14 09:55:19 +02:00
David Bürgin
a0a60e6e97 vim-patch: Mark patches as NA
These changes do not apply because a) they apply to removed code,
or b) they address problems to do with #ifdef'ed code.

Marks the following patches as NA:
- 7.4.610, https://github.com/vim/vim/commit/v7-4-610
- 7.4.618, https://github.com/vim/vim/commit/v7-4-618
- 7.4.619, https://github.com/vim/vim/commit/v7-4-619
- 7.4.621, https://github.com/vim/vim/commit/v7-4-621
- 7.4.622, https://github.com/vim/vim/commit/v7-4-622
- 7.4.625, https://github.com/vim/vim/commit/v7-4-625
- 7.4.626, https://github.com/vim/vim/commit/v7-4-626
- 7.4.638, https://github.com/vim/vim/commit/v7-4-638
- 7.4.647, https://github.com/vim/vim/commit/v7-4-647
- 7.4.648, https://github.com/vim/vim/commit/v7-4-648
- 7.4.650, https://github.com/vim/vim/commit/v7-4-650

One trivial change had already been included, so the patch number was
uncommented:

- 7.4.599, https://github.com/vim/vim/commit/v7-4-599
2015-05-14 09:55:19 +02:00
Michael Reed
94d784358f Merge pull request #2605 from Pyrohh/manpages
[RDY] Rewrite English man pages in mdoc, update for Nvim
2015-05-13 19:55:45 -04:00
Mark Bainter
7747bf64d8 minor cleanup. #2610
Update vim_isAbsName() to use bool type
cleanup casts in vim_findfile() and recover_names()

References #2470
2015-05-13 19:42:31 -04:00
Michael Reed
3a3a6bee0d nvim --help text: Unify with manpages 2015-05-13 18:16:51 -04:00
Michael Reed
e1c71993b3 English man pages: Convert to mdoc and rewrite for Nvim
Helped-by: Felipe Morales <hel.sheep@gmail.com>
Helped-by: Scott Prager <splinterofchaos@gmail.com>
Helped-by: Justin M. Keyes <justinkz@gmail.com>
Helped-by: Jakob Schnitzer <mail@jakobschnitzer.de>
2015-05-13 18:16:51 -04:00
Michael Reed
0086c0a53b Man pages: Move to nvim namespace and out of runtime/
Also clean up man page references in `runtime/doc/Makefile` as it
doesn't deal with them anymore.
2015-05-13 18:16:51 -04:00
Michael Reed
b0b3076995 main.c: Make '-v' synonymous with '--version'
This is done for consistency with '-h' and '--help'.
While here, also move the mch_exit() call out of usage
to make it clear what is being done.

Helped-by: Justin M. Keyes <justinkz@gmail.com>
2015-05-13 18:16:51 -04:00
Michael Reed
de7332c0f5 Merge pull request #2634 from Pyrohh/localmk-update
[RFC] contrib: Update local.mk
2015-05-13 17:37:36 -04:00
Michael Reed
75a884c41d ci: Remove USE_JEMALLOC reference
It was removed in 8130eb1191
2015-05-13 17:37:19 -04:00
Michael Reed
1e72b2e6bd contrib: Update local.mk
DUSE_JEMALLOC was removed in 8130eb1191

Helped-by: Florian Walch <florian@fwalch.com>
Helped-by: John Szakmeister <john@szakmeister.net>
2015-05-13 17:37:19 -04:00
Michael Reed
e888c479f3 Merge pull request #2619 from Pyrohh/char_u-to-char
[RDY] Remove char_u (6)
2015-05-13 15:31:40 -04:00
Michael Reed
af3381b319 Remove char_u: Review
Helped-by: Scott Prager <splinterofchaos@gmail.com>
2015-05-13 15:29:50 -04:00
Michael Reed
62bcd98ae3 Remove char_u: message:smsg_attr() 2015-05-13 15:29:50 -04:00
Michael Reed
3c5864772f Remove char_u: message:smsg() 2015-05-13 15:29:50 -04:00
Michael Reed
d666b0e48f Remove char_u: ex_docmd:get_view_file() 2015-05-13 15:29:49 -04:00
Michael Reed
743a0aa7f1 Remove char_u: main:use_vimrc 2015-05-13 15:29:49 -04:00
Michael Reed
b4534ba578 Remove char_u: main:process_env()
In addition, make static and modernize function comment
2015-05-13 15:29:49 -04:00
Michael Reed
5e60180a1e Remove char_u: ex_docmd:do_cmdline_cmd() 2015-05-13 15:29:49 -04:00
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