mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 01:13:05 +00:00
Merge pull request #255520 from Janik-Haag/fixVimSensible
vimPlugins: vim-sensible patch vimrc detection
This commit is contained in:
commit
dc86f6093b
@ -1475,6 +1475,10 @@ self: super: {
|
|||||||
dependencies = with self; [ denops-vim ];
|
dependencies = with self; [ denops-vim ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
vim-sensible = super.vim-sensible.overrideAttrs {
|
||||||
|
patches = [ ./patches/vim-sensible/fix-nix-store-path-regex.patch ];
|
||||||
|
};
|
||||||
|
|
||||||
vim-snipmate = super.vim-snipmate.overrideAttrs {
|
vim-snipmate = super.vim-snipmate.overrideAttrs {
|
||||||
dependencies = with self; [ vim-addon-mw-utils tlib_vim ];
|
dependencies = with self; [ vim-addon-mw-utils tlib_vim ];
|
||||||
};
|
};
|
||||||
|
@ -0,0 +1,25 @@
|
|||||||
|
From 07c799a1b170c0e28b385474b511c1034cfcb263 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Janik H <janik@aq0.de>
|
||||||
|
Date: Sat, 16 Sep 2023 19:45:32 +0200
|
||||||
|
Subject: [PATCH] fix nix store path regex
|
||||||
|
|
||||||
|
---
|
||||||
|
plugin/sensible.vim | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/plugin/sensible.vim b/plugin/sensible.vim
|
||||||
|
index 0fc26e0..b3ee6e9 100644
|
||||||
|
--- a/plugin/sensible.vim
|
||||||
|
+++ b/plugin/sensible.vim
|
||||||
|
@@ -26,7 +26,7 @@ function! s:MaySet(option) abort
|
||||||
|
silent verbose execute 'setglobal all' a:option . '?'
|
||||||
|
redir END
|
||||||
|
endif
|
||||||
|
- return out !~# " \\(\\~[\\/][^\n]*\\|Lua\\)$"
|
||||||
|
+ return out !~# "/nix/store/.*" && out !~# " \\(\\~[\\/][^\n]*\\|Lua\\)$"
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
if s:MaySet('backspace')
|
||||||
|
--
|
||||||
|
2.41.0
|
||||||
|
|
Loading…
Reference in New Issue
Block a user