Merge branch 'master' into plug-manager
This commit is contained in:
commit
35d9592b9b
17
README.md
17
README.md
@ -29,19 +29,14 @@ Or to some custom path:
|
||||
make PREFIX=/some/custom/path install
|
||||
```
|
||||
|
||||
## Ubuntu snap package
|
||||
Not usable for now due to some limitation!
|
||||
|
||||
This package also includes neovim, so neovim not needed and if present in system - not used. Install command:
|
||||
## archlinux
|
||||
AUR package for neovim-gtk https://aur.archlinux.org/packages/neovim-gtk-git
|
||||
```shell
|
||||
git clone https://aur.archlinux.org/neovim-gtk-git.git
|
||||
cd neovim-gtk-git
|
||||
makepkg -si
|
||||
```
|
||||
sudo snap install nvim-gtk --channel=candidate
|
||||
```
|
||||
There is some limitation for package: only `/home` directory available for editing and '~' is mapped to snap home directory.
|
||||
Config files must be placed in `~/snap/nvim-gtk/common/config/nvim/[g]init.vim` directory
|
||||
|
||||
Run command: `nvim-gtk <file_name>` or from dash: `NeovimGtk`.
|
||||
|
||||
To run neovim provided by snap package execute: `nvim-gtk.neovim`.
|
||||
|
||||
# Build
|
||||
## Linux
|
||||
|
@ -333,7 +333,7 @@ impl State {
|
||||
let nvim = self.nvim();
|
||||
if let Some(mut nvim) = nvim {
|
||||
if self.mode.is(&mode::NvimMode::Insert) || self.mode.is(&mode::NvimMode::Normal) {
|
||||
let paste_code = format!("normal! \"{}p", clipboard);
|
||||
let paste_code = format!("normal! \"{}P", clipboard);
|
||||
nvim.command(&paste_code).report_err(&mut *nvim);
|
||||
} else {
|
||||
let paste_code = format!("<C-r>{}", clipboard);
|
||||
@ -766,9 +766,6 @@ fn init_nvim_async(
|
||||
});
|
||||
|
||||
// attach ui
|
||||
let mut nvim = Some(nvim);
|
||||
glib::idle_add(move || {
|
||||
let mut nvim = nvim.take().unwrap();
|
||||
if let Err(err) = nvim::post_start_init(
|
||||
&mut nvim,
|
||||
options.open_path.as_ref(),
|
||||
@ -782,9 +779,6 @@ fn init_nvim_async(
|
||||
state.nvim.borrow_mut().set_initialized(nvim);
|
||||
state.cursor.as_mut().unwrap().start();
|
||||
}
|
||||
|
||||
Continue(false)
|
||||
});
|
||||
}
|
||||
|
||||
fn draw_initializing(state: &State, ctx: &cairo::Context) {
|
||||
|
Loading…
Reference in New Issue
Block a user