public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "vimPlugins: turn filetype and syntax before sourcing the plugins (#66536)"

Browse Source 
This reverts commit a3bf0c2e4005670fd710e7eb42403e0348754e77.
This commit is contained in:
Wael M. Nasreddine 2020-01-06 14:45:58 -08:00 committed by Jon
parent a1932826d7
commit 7909787a7d
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/editors/neovim/wrapper.nix
View File

@ -101,7 +101,7 @@ let
# Only display the log on error since it will contain a few normally # Only display the log on error since it will contain a few normally
# irrelevant messages. # irrelevant messages.
if ! $out/bin/nvim \ if ! $out/bin/nvim \
-u ${vimUtils.vimrcFile (configure // { customRC = ""; beforePlugins = ''filetype indent plugin on | syn on''; })} \ -u ${vimUtils.vimrcFile (configure // { customRC = ""; })} \
-i NONE -n \ -i NONE -n \
-E -V1rplugins.log -s \ -E -V1rplugins.log -s \
+UpdateRemotePlugins +quit! > outfile 2>&1; then +UpdateRemotePlugins +quit! > outfile 2>&1; then

5
pkgs/misc/vim-plugins/vim-utils.nix
View File

@ -188,8 +188,7 @@ let
vam ? null, vam ? null,
pathogen ? null, pathogen ? null,
plug ? null, plug ? null,
customRC ? "", customRC ? ""
beforePlugins ? "",
}: }:
let let
@ -342,8 +341,6 @@ let
" minimal setup, generated by NIX " minimal setup, generated by NIX
set nocompatible set nocompatible
${beforePlugins}
${vamImpl} ${vamImpl}
${pathogenImpl} ${pathogenImpl}
${plugImpl} ${plugImpl}