Shougo Matsushita
90537ae970
vim-patch:7.4.604
...
Problem: Running tests changes viminfo.
Solution: Disable viminfo.
6bf7c523ad
2015-12-19 12:58:01 +09:00
Justin M. Keyes
e123675bcc
Merge pull request #3722 from ZyX-I/fix-3721
...
shada: Continue dumping when variables failed to dump
2015-12-18 11:55:15 -05:00
ZyX
5c112c0cb9
shada: Free wms->hms in shada_write_exit
...
Otherwise there should be memory leak.
2015-12-18 19:29:49 +03:00
ZyX
ea67bf808b
shada: Continue dumping when variables failed to dump
...
Closes #3721
2015-12-18 19:29:49 +03:00
Justin M. Keyes
f638572164
Merge pull request #3863 from justinmk/vim-8a94d87
...
vim-patch:8a94d87
2015-12-18 10:51:37 -05:00
Justin M. Keyes
65f11d0a00
vim-patch:8a94d87
...
Update runtime files.
8a94d873aa
2015-12-17 21:56:41 -05:00
Justin M. Keyes
1e7a553ed7
vim-patch.sh: force LC_ALL=C for preprocessing
...
Any patch may contain mixed encodings, so we must process them as byte
arrays. E.g. with stock `sed` on OS X patch
8a94d873aa8c753a8522ea86a049bdf2abd0c507 causes this error:
sed: RE error: illegal byte sequence
To avoid that, set LC_ALL=C.
Also remove redundant *.patch creation from review_pr().
2015-12-17 21:28:54 -05:00
Justin M. Keyes
ecdf18edbb
Merge pull request #3860 from justinmk/vim-0122c40
...
vim-patch:0122c40
2015-12-17 15:23:35 -05:00
Justin M. Keyes
cb0b89f8ba
vim-patch:0122c40
...
Update runtime files.
0122c4070f
2015-12-17 05:14:40 -05:00
Justin M. Keyes
5b30ba7b99
Merge pull request #3859 from justinmk/vim-83caecf
...
vim-patch:83caecf
2015-12-17 05:06:07 -05:00
Justin M. Keyes
7581046b60
Merge pull request #3858 from justinmk/vim-9da7ff7
...
vim-patch:9da7ff7
2015-12-17 04:57:53 -05:00
Justin M. Keyes
1f27ccb77f
vim-patch:83caecf
...
Updated runtime files.
83caecf314
2015-12-17 04:52:20 -05:00
Justin M. Keyes
aa4cc17bb0
vim-patch:9da7ff7
...
Updated runtime files.
9da7ff70cc
2015-12-17 04:40:15 -05:00
Justin M. Keyes
9d64d75031
vim-patch.sh: fix order of non-tagged patches
...
Sort non-tagged patches in descending order, like tagged patches.
2015-12-17 04:07:03 -05:00
Justin M. Keyes
b051f33814
Merge pull request #3851 from brcolow/vim-7.4.682
...
vim-patch:7.4.682
2015-12-16 23:44:02 -05:00
brcolow
67f03f33a7
vim-patch:7.4.682
...
Problem: The search highlighting and match highlighting replaces the
cursorline highlighting, this doesn't look good.
Solution: Combine the highlighting. (Yasuhiro Matsumoto)
09deeb7c94
2015-12-16 13:13:04 -07:00
Justin M. Keyes
f9647d99b4
Merge pull request #3842 from sethjackson/cross-compile
...
Fix CMakeLists.txt search paths for cross compile
2015-12-16 10:18:15 -05:00
Justin M. Keyes
c42cb49a96
Merge pull request #3846 from sethjackson/win-defs
...
MSVC: Define S_IXUSR.
2015-12-16 10:12:49 -05:00
Rui Abreu Ferreira
aa36af214a
MSVC: Define S_IXUSR.
2015-12-16 05:46:49 -05:00
Justin M. Keyes
75cfd3c0ca
Merge pull request #3848 from Shougo/vim-7.4.665
...
vim-patch:7.4.665
vim-patch:7.4.671
2015-12-15 21:54:22 -05:00
Justin M. Keyes
5cb01bafa8
Merge pull request #3847 from Pyrohh/move-uncrustify
...
Move uncrustify.cfg to contrib/
2015-12-15 21:24:37 -05:00
Michael Reed
243b492c0d
contrib: Move uncrustify.cfg to contrib/
...
It hasn't been used in quite a while, so it's probably safe to move it
out of the repository root.
2015-12-15 15:34:49 -05:00
Shougo Matsushita
4cc38e04c7
vim-patch:7.4.665, 671
...
Problem: 'linebreak' does not work properly with multi-byte characters.
Solution: Compute the pointer offset with mb_head_off(). (Yasuhiro
Matsumoto)
76feaf1bfe
Problem: Warning for shadowing a variable.
Solution: Rename off to mb_off. (Kazunobu Kuriyama)
4df702999d
2015-12-16 05:18:25 +09:00
Rui Abreu Ferreira
8be2ab11de
Fix CMakeLists.txt search paths for cross compile
2015-12-15 13:53:46 -05:00
Justin M. Keyes
1946f96a16
Merge pull request #3841 from sethjackson/fname-illegal
...
Windows: define FNAME_ILLEGAL
2015-12-14 23:27:27 -05:00
Seth Jackson
e117544d72
Windows: define FNAME_ILLEGAL.
2015-12-14 17:45:35 -05:00
Justin M. Keyes
77c0f9a62b
Merge #3623 'vim-patch:7.4.{670,723,803}'
2015-12-13 14:18:05 -05:00
Johan Klokkhammer Helsing
ad34a376eb
Fix linting errors.
2015-12-13 13:06:48 +01:00
Johan Klokkhammer Helsing
c3ac16cfeb
Solve warnings.
2015-12-13 13:06:48 +01:00
Johan Klokkhammer Helsing
3b472e55b3
vim-patch:7.4.803
...
Problem: C indent does not support C11 raw strings. (Mark Lodato)
Solution: Do not change indent inside the raw string.
f7bb86dc59
2015-12-13 13:06:48 +01:00
Johan Klokkhammer Helsing
b079622716
Appease clint.
2015-12-13 13:06:48 +01:00
Johan Klokkhammer Helsing
238a8d33fa
vim-patch:7.4.723
...
Problem: For indenting, finding the C++ baseclass can be slow.
Solution: Cache the result. (Hirohito Higashi)
4032cfdf17
2015-12-13 13:06:39 +01:00
Johan Klokkhammer Helsing
123361f187
vim-patch:7.4.670
...
Problem: Using 'cindent' for Javascript is less than perfect.
Solution: Improve indenting of continuation lines. (Hirohito Higashi)
dcefba9934
2015-12-13 11:55:37 +01:00
Justin M. Keyes
8a34d21b0d
Merge pull request #3706 from Pyrohh/version_commit
...
Remove "Commit:" field from `--version` output
2015-12-13 03:00:09 -05:00
Justin M. Keyes
7387816dcb
Merge pull request #3481 from fabiopozzi/improve-it-translation
...
l10n: it translation
2015-12-13 02:14:26 -05:00
Justin M. Keyes
f406ae412e
Merge pull request #3838 from Shougo/vim-7.4.658
...
vim-patch:7.4.658
2015-12-13 01:47:34 -05:00
Justin M. Keyes
c3e4e0e383
Merge pull request #3837 from Shougo/vim-7.4.645
...
vim-patch:7.4.645
2015-12-13 01:45:17 -05:00
Justin M. Keyes
cd1be8350d
Merge pull request #3834 from Shougo/vim-7.4.635
...
vim-patch:7.4.635
2015-12-13 01:42:34 -05:00
Shougo Matsushita
0488fea0de
vim-patch:7.4.635
...
Problem: If no NL or CR is found in the first block of a file then the
'fileformat' may be set to "mac". (Issue 77)
Solution: Check if a CR was found. (eswald)
05eb612ff3
2015-12-13 15:06:35 +09:00
Justin M. Keyes
3c9d8ac99e
Merge #3718 'vim-patch:7.4.655'
2015-12-13 00:35:09 -05:00
Justin M. Keyes
014d692013
Merge pull request #3835 from Shougo/vim-7.4.640
...
vim-patch:7.4.640
2015-12-13 00:31:30 -05:00
Justin M. Keyes
28821397f6
Merge pull request #3836 from sethjackson/set-init-3
...
Windows: Remove broken check for WIN3264
2015-12-13 00:24:44 -05:00
Justin M. Keyes
1b6e7f9e39
test: fixeol_spec: setup/teardown
...
Without this cleanup, test will fail if run multiple times.
2015-12-13 00:21:11 -05:00
Justin M. Keyes
aca51f3d93
Merge #3443 'vim-patch:7.4.{785,795,898}'
2015-12-13 00:09:07 -05:00
Seth Jackson
a9b4cedb08
Windows: Remove broken check for WIN3264.
...
We do not define WIN3264 so this check was broken.
Futher since UNIX is defined on all Unix platforms
we support we can simply remove this #ifdef.
2015-12-12 23:30:43 -05:00
Shougo Matsushita
815fe24604
vim-patch:7.4.658
...
Problem: 'formatexpr' is evaluated too often.
Solution: Only invoke it when beyond the 'textwidth' column, as it is
documented. (James McCoy)
0f8dd840fc
2015-12-13 13:10:31 +09:00
Shougo Matsushita
d1ec3f661a
vim-patch:7.4.645
...
Problem: When splitting the window in a BufAdd autocommand while still in
the first, empty buffer the window count is wrong.
Solution: Do not reset b_nwindows to zero and don't increment it.
8da9bbfd02
2015-12-13 13:01:46 +09:00
Justin M. Keyes
ebdb802bf5
Merge pull request #3816 from sethjackson/win-setenv
...
Windows: Implement os_setenv()
2015-12-12 22:57:02 -05:00
Shougo Matsushita
f1b9a59ed6
vim-patch:7.4.640
...
Problem: After deleting characters in Insert mode such that lines are
joined undo does not work properly. (issue 324)
Solution: Use Insstart instead of Insstart_orig. (Christian Brabandt)
c3bbad085c
2015-12-13 12:53:30 +09:00
Rui Abreu Ferreira
810d31a430
Windows: Implement os_setenv() using _putenv_s()
...
Windows does not have setenv(), instead the _putenv_s() function is used - added
a function check and fatal errors. Implemented os_setenv() for Windows.
Vim supports the original putenv() function if no alternative is available.
Neovim only supports systems where safer alternatives exist, so the check for
putenv() was removed from config/CMakeLists.txt.
2015-12-12 22:33:10 -05:00