Commit Graph
2921 Commits
Author SHA1 Message Date
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)

https://github.com/vim/vim/commit/09deeb7c945d2677722df5b40959f97b646b6092
2015-12-16 13:13:04 -07: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
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)

https://github.com/vim/vim/commit/76feaf1bfed170d2fc5c34e7e758885554ecc794

Problem:    Warning for shadowing a variable.
Solution:   Rename off to mb_off. (Kazunobu Kuriyama)

https://github.com/vim/vim/commit/4df702999d14955255fcdfb820511767dcfec463
2015-12-16 05:18:25 +09:00
Seth Jackson e117544d72 Windows: define FNAME_ILLEGAL. 2015-12-14 17:45:35 -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.

https://github.com/vim/vim/commit/f7bb86dc593913d055e4cce16cec43f6271adda3
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)

https://github.com/vim/vim/commit/4032cfdf17c1c744d0f87219924870378b86a1c4
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)

https://github.com/vim/vim/commit/dcefba993456263100785f18d21d780cf531f2dc
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)

https://github.com/vim/vim/commit/05eb612ff3597fb7102f892bfd320f28b56d2fc6
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 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)

https://github.com/vim/vim/commit/0f8dd840fc6a614450db60ebe405d6201a2ecc3e
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.

https://github.com/vim/vim/commit/8da9bbfd02957b79edd595c8c7397453012510b0
2015-12-13 13:01:46 +09: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)

https://github.com/vim/vim/commit/c3bbad085c3ec304b111dc95aed97fea4c38a177
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
ZyX 5b96d370df eval: Use list_unref in place of decrementing refcount directly 2015-12-13 03:44:54 +03:00
ZyX 1cf7de074b eval: Replace internal_refcount hack with proper copyID setting 2015-12-13 03:44:53 +03:00
Justin M. Keyes cc203e4b93 Merge pull request #3753 from watiko/vim-7.4.790
Vim 7.4.{786,787,789,790}
2015-12-12 17:43:23 -05:00
Justin M. Keyes f37ad6af36 Merge pull request #3807 from ZyX-I/improve-clint
Make clint.py better follow our style guide
2015-12-12 17:32:05 -05:00
ZyX a35c45732c shada: Fix all linter errors in src/nvim/shada.*
This commit is an example of fixing incorrect code which previously passed
through linter.
2015-12-13 00:47:46 +03:00
Justin M. Keyes 2b12406f2e Merge pull request #3824 from sethjackson/pstrcmp
Windows: Remove UNIX guard for pstrcmp()
2015-12-12 14:45:46 -05:00
Seth Jackson 7f8365e302 Windows: Remove unnecessary codepath from modname.
File names starting with periods are perfectly acceptable on Windows
file systems. The only place where this is not acceptable is on
MS-DOS FAT file systems which only support 8.3 file names.

See here:
https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247%28v=vs.85%29.aspx

Since Neovim does not support MS-DOS or 8.3 file names (#605)
we can drop this codepath.

It was not compiling anyways since we do not define WIN3264.
2015-12-11 20:26:38 -05:00
Rui Abreu Ferreira fe143ac439 Windows: Remove UNIX guard for pstrcmp()
@equalsraf: I took a look at the Vim source pstrcmp() is actually used in the
dos_expandpath(misc1.c). The only difference between the UNIX and WIN32 version
of the functions is the _cdecl call convention annotation - the body of the
function is identical. Neovim kept the comment from the Unix function but not
from the Windows variant. Seems to me its safe to use the same function for
both - and just correct the comment.
2015-12-11 19:10:06 -05:00
watiko 1b56425662 Make clint status valid 2015-12-12 08:15:34 +09:00
watiko 74341ca5ca Fix the memory leaking 2015-12-12 05:28:27 +09:00
watiko 8c684b2fdb Revert char to char_u 2015-12-12 04:26:22 +09:00
Enrico Ghirardi 81960df9f5 statusline: Check width before advancing pointer. #3818
Closes #3763

Helped-by: oni-link <knil.ino@gmail.com>
2015-12-10 03:19:02 -05:00
Justin M. Keyes bf65b3ab45 Merge pull request #3804 from sethjackson/signal-guards
Add guards for SIGPIPE and SIGQUIT
2015-12-09 23:17:07 -05:00
Justin M. Keyes 87abe073d9 Merge pull request #3783 from sethjackson/log-file-def
Update USR_LOG_FILE definition.
2015-12-09 21:29:49 -05:00
Rui Abreu Ferreira 3abbdb2f41 Windows: Define HOME environment variable
- Bring back Vim code for settings $HOME in Windows from
  $HOMEDRIVE$HOMEPATH
- vim-patch:0
2015-12-08 22:55:40 -05:00
Rui Abreu Ferreira 67a7b1785c Add guards for SIGPIPE and SIGQUIT
In some systems the signals SIGPIPE and SIGQUIT are not available.
2015-12-08 00:17:34 -05:00
Rui Abreu Ferreira 0ab4f2f18f Update USR_LOG_FILE definition. 2015-12-07 19:26:26 -05:00
Justin M. Keyes 6d583f8587 Merge pull request #3780 from sethjackson/header-guards
Add missing guard for HAVE_UNISTD_H
2015-12-07 03:16:03 -05:00
watiko 3a60f927b8 Improve coding style 2015-12-06 07:41:09 +09:00
Michael Reed 7be12edd38 Remove "Commit:" field from --version output
If nvim is built from a non-tagged commit, the truncated commit hash is
already appended to the main version string (e.g., "NVIM v0.1.0-83-g959f260 ..."),
making the "Commit:" field redundant.

Regarding the truncated hash length: we don't have nearly enough commits
to worry about collisions, and probably won't ever, so the default
length should be fine.
2015-12-05 16:15:32 -05:00
Rui Abreu Ferreira 12b23070d4 Fix Windows code in command_line_execute() 2015-12-04 23:25:04 -05:00
Rui Abreu Ferreira 07eaff7c26 Add missing guard for HAVE_UNISTD_H 2015-12-02 19:54:33 -05:00
Wayne Rowcliffe 78e7c4066e undo.c: Change return type to bool on functions #3697
Update some comments, too.

Reviewed-by: Björn Linse <bjorn.linse@gmail.com>
Reviewed-by: Michael Reed <Pyrohh@users.noreply.github.com>
2015-12-01 15:50:07 -05:00