Commit Graph

3649 Commits

Author SHA1 Message Date
Justin M. Keyes
44179d7444 Merge pull request #4263 from watiko/vim-7.4.901
vim-patch:7.4.901
2016-02-22 01:03:51 -05:00
Justin M. Keyes
73676ad37b Merge pull request #4262 from watiko/vim-7.4.893
vim-patch:7.4.{891,893,912}
2016-02-22 01:02:18 -05:00
watiko
2eb09c826d vim-patch:7.4.878 #4258
Problem:    Coverity error for clearing only one byte of struct.
Solution:   Clear the whole struct. (Dominique Pelle)

69b67f7e77
2016-02-22 00:51:13 -05:00
Justin M. Keyes
2f98888db6 Merge pull request #4310 from jbradaric/vim-7.4.939
vim-patch:7.4.939
2016-02-22 00:48:54 -05:00
Justin M. Keyes
f08fd41282 Merge pull request #4250 from jbradaric/vim-7.4.895
vim-patch:7.4.895
2016-02-22 00:45:51 -05:00
Justin M. Keyes
9e00724c38 Merge pull request #4307 from jbradaric/vim-7.4.870
vim-patch:7.4.870
2016-02-22 00:41:55 -05:00
Justin M. Keyes
d9291954b9 Merge pull request #4259 from watiko/vim-7.4.881
vim-patch:7.4.{879,881}
2016-02-22 00:34:24 -05:00
Justin M. Keyes
6395dd64a4 Merge pull request #4167 from lucc/test11
tests: migrate legacy test 11
2016-02-21 23:49:36 -05:00
Justin M. Keyes
dd4b661dbd Merge pull request #4243 from lucc/test36
tests: Migrate legacy test 36.
2016-02-21 23:47:15 -05:00
Shougo Matsushita
d92db14241 completion: Avoid flicker. 2016-02-21 15:58:38 -05:00
Justin M. Keyes
44166a150c Merge pull request #4314 from justinmk/mksession_terminal
mksession: Restore buftype=terminal windows.
2016-02-21 15:22:05 -05:00
Justin M. Keyes
4bd848f24f mksession: Restore buftype=terminal windows.
Closes #4311
2016-02-21 14:42:31 -05:00
watiko
693bf1dafb path.c: Fulfill the @returns conditions
Original-author: oni-link <knil.ino@gmail.com>
2016-02-21 22:07:42 +09:00
watiko
d6c894efaf vim-patch:7.4.903
Problem:    MS-Windows: When 'encoding' differs from the current code page,
            expandinig wildcards may cause illegal memory access.
Solution:   Allocate a longer buffer. (Ken Takata)

7314efd87d
2016-02-21 22:06:39 +09:00
watiko
6bbd149e98 vim-patch:7.4.845
Problem:    Compiler warning for possible loss of data.
Solution:   Add a type cast. (Erich Ritz)

5df1ed2de3
2016-02-21 22:06:39 +09:00
watiko
6ea1047585 vim-patch:7.4.832
Problem:    $HOME in `=$HOME . '/.vimrc'` is expanded too early.
Solution:   Skip over `=expr` when expanding environment names.

be83b73ddb

---

To reproduce:

```sh
nvim -u NONE -c 'e `=$HOME . "/.vimrc"`'
```
2016-02-21 22:06:39 +09:00
watiko
c8561ecf26 vim-patch:7.4.831
Problem:    When expanding `=expr` on the command line and encountering an
            error, the command is executed anyway.
Solution:   Bail out when an error is detected.

3f188935ec
2016-02-21 22:06:23 +09:00
Jurica Bradaric
82293b94c3 ex_docmd: Fix code style in ex_match 2016-02-21 11:21:45 +01:00
Jurica Bradaric
29b393e43a vim-patch:7.4.939
Problem:    Memory leak when encountering a syntax error.
Solution:   Free the memory. (Dominique Pelle)

9a7d58e42e
2016-02-21 11:15:08 +01:00
Justin M. Keyes
fc51f86b72 Merge pull request #4296 from mhinz/fix-termclose
Make TermClose event return the associated buffer
2016-02-21 02:04:13 -05:00
Marco Hinz
fe8b2fabe7 Make TermClose event return the associated buffer
<abuf> from the TermClose event now returns the correct buffer number.

Prior to this change it would always return the buffer number of the current
buffer, which is obviously wrong in an async environment.
2016-02-21 02:38:55 +01:00
Justin M. Keyes
51055c14a6 Merge pull request #4306 from justinmk/termau
terminal_open: do not force autocmds
2016-02-20 16:02:50 -05:00
Jurica Bradaric
5b263ac6ad vim-patch:7.4.870
Problem:    May get into an invalid state when using getchar() in an
            expression mapping.
Solution:   Anticipate mod_mask to change. (idea by Yukihiro Nakadaira)

2455c4ede8
2016-02-20 19:15:13 +01:00
Lucas Hoffmann
1b8caf3d75 test: charsearch: Fix error/typo in legacy test.
Error was reported upstream in vim/vim#650, fixed in 7.4.1366.
Typo was fixed upstream in 7.4.1041.
2016-02-20 10:52:02 -05:00
Lucas Hoffmann
4a02dc0828 tests: Remove old charset test after migration. 2016-02-20 07:57:55 +01:00
Felipe Morales
af67f022ca Merge pull request #4264 from watiko/vim-7.4.922
vim-patch:7.4.922
2016-02-19 22:07:46 +01:00
Justin M. Keyes
00347ec781 Merge pull request #4240 from jbradaric/vim-7.4.888
vim-patch:7.4.888
2016-02-19 04:06:29 -05:00
Justin M. Keyes
87a49405b0 terminal_open: do not force autocmds 2016-02-19 03:03:11 -05:00
Justin M. Keyes
156df2c81b coverity/135593: Error handling issues (CHECKED_RETURN)
Harmless issue (HI): retval is intentionally ignored, as is the wont of
didset_options() and friends.
2016-02-19 02:00:23 -05:00
Justin M. Keyes
06e53aa487 coverity/135589: (FP) Null pointer dereferences
False positive: buflist_findnr() should not be NULL in this case because
it is given a buffer number that (should be) guaranteed to exist.
2016-02-19 02:00:22 -05:00
Justin M. Keyes
f887037a8f Merge pull request #4276 from justinmk/coverity135578
coverity/135578: Memory - illegal accesses
2016-02-17 10:45:24 -05:00
watiko
0d6cd2b808 option_defs.h: Introduce SHM_ABBREVIATIONS
Helped-by: ZyX <kp-pav@yandex.ru>
2016-02-17 21:04:24 +09:00
watiko
5b63488c25 option_defs.h: Fix "set shm+=a" 2016-02-17 21:04:20 +09:00
watiko
0b67bb8c25 option_defs.h: Improve coding style 2016-02-17 21:04:20 +09:00
watiko
4612821946 vim-patch:7.4.925
Problem:    User may yank or put using the register being recorded in.
Solution:   Add the recording register in the message. (Christian Brabandt,
            closes vim/vim#470)

a0ed84a268
2016-02-17 21:04:20 +09:00
Justin M. Keyes
498eb02049 Merge pull request #4239 from jbradaric/vim-7.4.885
vim-patch:7.4.885
2016-02-17 04:31:21 -05:00
Jurica Bradaric
bd7de9dac9 vim-patch:7.4.859 #4238
Problem:    Vim doesn't recognize all htmldjango files.
Solution:   Recognize a comment. (Daniel Hahler, PR #410)

d8986fd914
2016-02-17 04:28:01 -05:00
Justin M. Keyes
e4e5815242 Merge pull request #4244 from watiko/vim-7.4.830
vim-patch:7.4.{830,833}
2016-02-17 04:26:29 -05:00
Justin M. Keyes
b2b3768bb4 Merge pull request #4234 from watiko/vim-7.4.977
vim-patch:7.4.{818,883,977}
2016-02-17 04:10:50 -05:00
Justin M. Keyes
af1745a763 Merge pull request #4230 from jbradaric/vim-7.4.853
vim-patch:7.4.{853,856}
2016-02-17 04:08:57 -05:00
Justin M. Keyes
9198b06ea6 Merge pull request #4229 from jbradaric/vim-7.4.847
vim-patch:7.4.847
2016-02-17 04:04:27 -05:00
Jurica Bradaric
560a346d57 vim-patch:7.4.844 #4228
Problem:    When '#' is in 'isident' the is# comparator doesn't work.
Solution:   Don't use vim_isIDc(). (Yasuhiro Matsumoto)

37a8de17d4
2016-02-17 03:59:58 -05:00
Justin M. Keyes
5f54519b4f Merge pull request #4213 from jbradaric/vim-7.4.835
vim-patch:7.4.{835,843,877}
2016-02-17 03:49:57 -05:00
Justin M. Keyes
6dc39d84cf Merge pull request #4188 from jbradaric/vim-7.4.868
vim-patch:7.4.868
2016-02-17 03:45:12 -05:00
watiko
db20edef69 vim-patch:7.4.937
Problem:    Segfault reading unitialized memory.
Solution:   Do not read match \z0, it does not exist. (Marius Gedminas, closes
            vim/vim#497)

5ad075c073
2016-02-17 03:00:13 +09:00
watiko
c9f4f828d5 version.c: Mark 7.4.935 NA
Problem:    test_utf8 fails on MS-Windows when executed with gvim.
Solution:   Use the insert flag on feedkeys() to put the string before the
            ":" that was already read when checking for available chars.

6040256d8b

---

feedkeys() is not used by legacy test utf8.
2016-02-16 22:56:47 +09:00
watiko
9036f1644f vim-patch:7.4.933
Problem:    Crash when using longest completion match.
Solution:   Fix array index.

e4eda3bc71
2016-02-16 22:56:02 +09:00
Justin M. Keyes
9648bf795a coverity/135578: Memory - illegal accesses
Harmless issue, but doesn't hurt to satisfy coverity here.
2016-02-16 04:25:59 -05:00
Jurica Bradaric
30b452b470 ex_docmd: Don't use pre-increment. 2016-02-16 07:20:47 +01:00
Jurica Bradaric
3b34c992bc vim-patch:7.4.895
Problem:    Custom command line completion does not work for a command
            containing digits.
Solution:   Skip over the digits. (suggested by Yasuhiro Matsumoto)

23d1b62746
2016-02-16 07:18:48 +01:00