Commit Graph

8225 Commits

Author SHA1 Message Date
Justin Gassner
9b87955b34 vim-patch:7.4.{629,695,696,701} Mark as included #2666
https://github.com/vim/vim/commit/v7-4-629
https://github.com/vim/vim/commit/v7-4-695
https://github.com/vim/vim/commit/v7-4-696
deal with coverity issues which were fixed by #1947

https://github.com/vim/vim/commit/v7-4-701
fixes a compiler warning for an uninitialized variable introduced in 695
2015-05-16 16:05:28 -04:00
Michael Reed
6f72f56492 Change 'backspace' default to "indent,eol,start" #2639
While here, alphabetically sort section 2 of vim_diff.txt

Helped-by: Jakob Schnitzer <mail@jakobschnitzer.de>
Helped-by: Felipe Morales <hel.sheep@gmail.com>
2015-05-15 16:28:57 -04: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
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
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
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
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
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
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
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
David Bürgin
9e91bb461f tests: Migrate legacy test 96 #2220 2015-05-04 23:36:08 -04:00