Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RFC] vim-patch:8.0.0308,8.0.0325,8.0.0326,8.0.0437,8.0.0612,8.0.0680 #7201

Merged
merged 6 commits into from Aug 22, 2017

Conversation

jamessan
Copy link
Member

@jamessan jamessan commented Aug 21, 2017

vim-patch:8.0.0308

Problem: When using a symbolic link, the package path will not be inserted
at the right position in 'runtimepath'. (Dugan Chen, Norio Takagi)
Solution: Resolve symbolic links when finding the right position in
'runtimepath'. (Hirohito Higashi)

vim/vim@2f9e575

vim-patch:8.0.0325

Problem: Packadd test does not clean up symlink.
Solution: Delete the link. (Hirohito Higashi)

vim/vim@913727e

vim-patch:8.0.0326

Problem: Packadd test uses wrong directory name.
Solution: Use the variable name value. (Hirohito Higashi)

vim/vim@24f8f54

vim-patch:8.0.0437

Problem: The packadd test does not create the symlink correctly and does
not test the right thing.
Solution: Create the directory and symlink correctly.

vim/vim@644df41

vim-patch:8.0.0612

Problem: Package directories are added to 'runtimepath' only after loading
non-package plugins.
Solution: Split off the code to add package directories to 'runtimepath'.
(Ingo Karkat, closes vim/vim#1680)

vim/vim@ce876aa

vim-patch:8.0.0680

Problem: Plugins in start packages are sourced twice. (mseplowitz)
Solution: Use the unmodified runtime path when loading plugins (test by Ingo
Karkat, closes vim/vim#1801)

vim/vim@07ecfa6

Closes #7200
Closes #6869

@marvim marvim added the RFC label Aug 21, 2017
src/nvim/main.c Outdated
add_pack_start_dirs();
}

source_runtime((char_u *)"plugin/**/*.vim", DIP_ALL | DIP_NOAFTER); // NOLINT
source_in_path(rtp_copy, (char_u *)"plugin/**/*.vim", // NOLINT
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the vim patch does rtp_copy == NULL ? p_rtp : rtp_copy

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Vim checks for NULL, we don't. vim_strsave is a very thin wrapper around xstrdup for us, mainly handling casting.

Copy link
Member

@justinmk justinmk Aug 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, but isn't it possible that rtp_copy is null if the condition on line 1301 is false? Even if it's not possible because of "action at a distance", I would tend to prefer the localized guard which removes all doubt.

Problem:    When using a symbolic link, the package path will not be inserted
            at the right position in 'runtimepath'. (Dugan Chen, Norio Takagi)
Solution:   Resolve symbolic links when finding the right position in
            'runtimepath'. (Hirohito Higashi)

vim/vim@2f9e575
Problem:    Packadd test does not clean up symlink.
Solution:   Delete the link. (Hirohito Higashi)

vim/vim@913727e
Problem:    Packadd test uses wrong directory name.
Solution:   Use the variable name value. (Hirohito Higashi)

vim/vim@24f8f54
Problem:    The packadd test does not create the symlink correctly and does
            not test the right thing.
Solution:   Create the directory and symlink correctly.

vim/vim@644df41
Problem:    Package directories are added to 'runtimepath' only after loading
            non-package plugins.
Solution:   Split off the code to add package directories to 'runtimepath'.
            (Ingo Karkat, closes vim/vim#1680)

vim/vim@ce876aa
Problem:    Plugins in start packages are sourced twice. (mseplowitz)
Solution:   Use the unmodified runtime path when loading plugins (test by Ingo
            Karkat, closes vim/vim#1801)

vim/vim@07ecfa6
@jamessan jamessan merged commit 1d175f3 into neovim:master Aug 22, 2017
@jszakmeister jszakmeister removed the RFC label Aug 22, 2017
@jamessan jamessan deleted the vim-8.0.0308 branch September 1, 2017 18:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants