kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity
5,101 Commits 10 Branches 47 Tags 407 MiB
e65fce8ed3
Commit Graph

5101 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Walch
e65fce8ed3 vim-patch.sh: Replace #<number> with vim/vim#<number> in commit messages. 2016-02-17 00:18:19 +01:00
Florian Walch
cc6299ecbc vim-patch.sh: Support multi-patch pull requests. 
* Calling "vim-patch.sh -p" on a checked-out branch already created with
  "-p" will re-use the branch and append commits.

* Fetch upstream/master before checking out branch on first call of "-p".

* Reverted creation of commit in submit step ("-s") to previous behavior:
  Create an empty commit with correct commit message when "-p" is called.

* Submitting a pull request with "-s" will create a correct pull request
  message even if multiple patches have been ported in one single branch
  with "-p".
 2016-02-17 00:18:19 +01:00
Florian Walch
775a16b0b7 vim-patch.sh: Add -s (submit pull request) option. 
When calling "vim-patch.sh -s" on a checked-out branch created with
"vim-patch.sh -p", create commit from staged changes, push to origin,
create pull request (using hub), and clean up patch files.
 2016-02-17 00:18:19 +01:00
Florian Walch
07eabc062e vim-patch.sh: Use .patch files only. 2016-02-17 00:18:19 +01:00
Florian Walch
b768d8a09c vim-patch.sh: Improvements for review functionality. 
* Support pull requests with multiple commits.
 * Offer to clean up files after review.
 * Always use full commit hash in assign_commit_details().
 2016-02-17 00:18:19 +01:00
Björn Linse
5af9ae9e60 Merge pull request #4171 from cacplate/pr-3694 
diff.c: change return type to bool (adoption of #3694)
 2016-02-15 23:07:31 +01:00
Marco Hinz
089368c15f Doc: correct default value 2016-02-15 19:55:51 +01:00
Charles Joachim
b3bdf9f356 diff.c: change return type to bool 
Co-authored-by: Wayne Rowcliffe (@war1025)
 2016-02-15 12:41:08 -05:00
Justin M. Keyes
7609a96a35 Merge pull request #4260 from watiko/vim-7.4.887 
vim-patch:7.4.887
 2016-02-15 04:17:25 -05:00
watiko
ec6fcf3b1c vim-patch:7.4.887 
Problem:    Using uninitialized memory for regexp with back reference.
            (Dominique Pelle)
Solution:   Initialize end_lnum.

c2b717ebd6

---

see: "[bug] use of uninitialized memory in regexp_nfa.c with invalid back reference"
     https://groups.google.com/d/msg/vim_dev/JWmrT5-NnPQ/U_TgaRW8AwAJ
 2016-02-15 18:10:30 +09:00
Justin M. Keyes
baee9fe286 Merge pull request #4220 from watiko/vim-7.4.792 
vim-patch:7.4.792
 2016-02-15 03:55:23 -05:00
Justin M. Keyes
1e995ea2fd Merge #4140 'vim-patch:7.4.771'. 2016-02-15 01:48:30 -05:00
Justin M. Keyes
69234f4a76 test: search_mbyte_spec: minor cleanup 
mbyte.vim, small.vim are not relevant to migrated legacy tests.
 2016-02-15 01:47:43 -05:00
Justin M. Keyes
e0ca30553b Merge pull request #4166 from lucc/legacy/command_count 
tests: Migrate legacy test command_count.
 2016-02-15 01:10:15 -05:00
Justin M. Keyes
02612a3fc9 Merge pull request #4254 from Shougo/remote 
Improve remote plugin scripts
 2016-02-15 00:27:43 -05:00
Justin M. Keyes
e3bf1385e6 Merge pull request #4252 from justinmk/filetype 
defaults: Enable filetypes, syntax
 2016-02-14 17:20:55 -05:00
Justin M. Keyes
cc2dce45d0 startup: Avoid VimL global. Introduce TriState enum. 
- `syntax_on` is documented. Rather than introduce a new undocumented
  VimL global `g:syntax_off`, use a module-local flag.
- Rename "maybe" functions to follow style guidelines (use standard
  module prefix)
 2016-02-14 16:23:04 -05:00
Felipe Morales
6c9c08c370 startup: respect earlier :filetype and :syntax. 
If user invokes :filetype or :syntax before startup defaults are
applied, don't clobber their choices.
 2016-02-14 15:38:11 -05:00
Justin M. Keyes
da6299445a ex_docmd: rename force_enable_filetype(). 
It is no longer forcing anything.
 2016-02-14 15:20:32 -05:00
Felipe Morales
9c2c24ec48 syntax: don't override user settings 2016-02-14 15:20:32 -05:00
Justin M. Keyes
cae0904160 syntax: avoid extra global macro 2016-02-14 15:20:31 -05:00
Felipe Morales
50e129f5a7 defaults: Enable syntax and filetype plugins. 2016-02-14 15:20:31 -05:00
Björn Linse
75f6817a51 Merge pull request #4216 from bfredl/rebuild 
build system: avoid more unneccesary recompiles
 2016-02-14 12:07:55 +01:00
Björn Linse
8d7ab23b49 build system: avoid more unneccesary recompiles 2016-02-14 11:41:28 +01:00
Justin M. Keyes
d19af41db4 Merge pull request #4248 from watiko/vim-nas 
version.c: Mark patches NA
 2016-02-13 18:47:23 -05:00
Shougo Matsushita
41794f6b58 Improve remote plugin scripts 2016-02-14 08:24:49 +09:00
watiko
0b21956edb version.c: Mark patches NA 
NA patch list:

684: vim_tempfile() was refactored
     e5c421cfd7

725: str_to_reg() was refactored
     659c94d483

752: (Unicode 8.0) automatically generates these tables
     66312acf14

767: (clientserver)
     fafeee6b9e

804: (xxd)
     43fe32900c

812: ml_add_stack() was refactored by e53dda90bd
     fbd302ff38

821: (coverity)
     handled by 33cecbbf16
                aca6dc5001
                bb674e0fcd
     bd8539aac3

827: (src/Makefile)
     8cba8ba3e0

838: (crypt, ifdef)
     8060687905

839: (cast) vim_strnsave()'s 2nd argument type is already size_t
     6ed535dbc0

860: (empty commit) missing parts are in other runtime comitts
     a122b5e98a

865: (uninitializing) handled by 7f99d210fd
     ed84b76021

866: (netbeans)
     93c88e0f6a

873: (netbeans, unused) related to 866
     b8603882b1

897: (clientserver)
     4e86150ec5

---

NA runtime patch:

vim-patch:e2db6c9
 2016-02-14 08:05:39 +09:00
Justin M. Keyes
364d764889 Merge #2674 2016-02-13 15:22:12 -05:00
Justin M. Keyes
7567afbbe5 test: completion_spec: minor edits 2016-02-13 15:21:28 -05:00
Justin M. Keyes
f03ab69a35 Merge pull request #4237 from Jun-T/shada-symlink 
resolve symlink in shada_spec test
 2016-02-11 18:23:15 -05:00
Jun T
edbc97225d test: shada_spec: resolve symlink 
If the build directory path has symlinks in it, 'make functionaltest'
fails at shada_spec.lua:177 because readme_fname has symlink but
nvim resolves the symlink when writing it into the shada file.
 2016-02-12 00:03:39 +09:00
Justin M. Keyes
8ba32e219f Merge pull request #4235 from watiko/vim-7.4.828 
vim-patch:7.4.828
 2016-02-11 09:32:53 -05:00
watiko
d115b58cdc vim-patch:7.4.828 
Problem:    Crash when using "syn keyword x c". (Dominique Pelle)
Solution:   Initialize the keyword tabble. (Raymond Ko, PR 397)

670acbc70f

---

see: "fix crash due to hash table not being initialized"
     https://github.com/vim/vim/pull/397

To reproduce:

```sh
nvim -u NONE -c ow -c 'sy keyword x c'
```
 2016-02-11 19:06:54 +09:00
Justin M. Keyes
adb73b6025 Merge pull request #4204 from watiko/vim-7.4.915 
vim-patch:7.4.{749,915}
 2016-02-11 03:45:08 -05:00
Justin M. Keyes
63d750f310 Merge pull request #4186 from watiko/vim-7.4.929 
vim-patch:7.4.{734,743,929}
 2016-02-11 03:35:09 -05:00
watiko
bfab33ef79 vim-patch:7.4.931 (NA) 
Problem:    Test 94 fails on some systems.
Solution:   Set 'encoding' to utf-8.

cfcd1ddd10

---

Neovim cannot change encoding after start-up.
 2016-02-11 15:14:36 +09:00
watiko
51c3e0aa80 vim-patch:7.4.929 
Problem:    "gv" after paste selects one character less if 'selection' is
            "exclusive".
Solution:   Increment the end position. (Christian Brabandt)

d29c6fea94
 2016-02-11 15:13:30 +09:00
watiko
663e1ed158 vim-patch:7.4.743 
Problem:    "p" in Visual mode causes an unexpected line split.
Solution:   Advance the cursor first. (Yukihiro Nakadaira)

c004bc2726
 2016-02-11 15:13:30 +09:00
watiko
4a0e10fb2c vim-patch:7.4.734 
Problem:    ml_get error when using "p" in a Visual selection in the last
            line.
Solution:   Change the behavior at the last line. (Yukihiro Nakadaira)

d009e86826
 2016-02-11 15:13:30 +09:00
watiko
b137ebdd17 tests: Migrate legacy test match_conceal 2016-02-11 15:08:31 +09:00
watiko
133ef7e465 vim-patch:7.4.792 
Problem:    Can only conceal text by defining syntax items.
Solution:   Use matchadd() to define concealing. (Christian Brabandt)

6561d52ecb
 2016-02-11 15:08:31 +09:00
Florian Walch
84281bf675 Merge pull request #4205 from watiko/vim-7.4.737 
vim-patch:7.4.737
 2016-02-10 20:51:14 +01:00
Justin M. Keyes
953e140a18 Merge pull request #4224 from fmoralesc/docs-term 
doc: remove references to 'term' and other tty related options.
 2016-02-10 11:01:23 -05:00
Felipe Morales
11f43360d1 doc: remove references to 'term' and other tty related options. 
Re: https://github.com/neovim/neovim/issues/4218
 2016-02-10 16:52:48 +01:00
Justin M. Keyes
9b9695ab8e Merge pull request #4221 from Jun-T/install-mo 
install *.mo files correctly
 2016-02-10 10:37:24 -05:00
Justin M. Keyes
c74dc9dd6c Merge pull request #4225 from bfredl/helptags 
build: if helptags generation fails, echo the message
 2016-02-10 10:27:08 -05:00
Jun T
81f54f909e set VIMPACKAGE to "nvim" 2016-02-10 21:34:10 +09:00
Björn Linse
222a1655f5 cmake: if helptags generation fails, echo the message 2016-02-10 13:23:23 +01:00
Felipe Morales
c2384597ef Merge pull request #4217 from fmoralesc/vim-7.4.735 
vim-patch: 7.4.735 is NA
 2016-02-10 11:17:47 +01:00
Felipe Morales
c5c53ed8b4 vim-patch:7.4.735 (NA) 
Problem:    Wrong argument for sizeof().
Solution:   Use a pointer argument. (Chris Hall)

e2e4b98622

This was already handled in nvim.
 2016-02-10 10:25:18 +01:00