hasufell
/
neovim-gtk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into plug-manager

This commit is contained in:
daa 2017-10-14 14:54:48 +03:00
parent c5ee1ab586 cda55e0f7d
commit 35d9592b9b
2 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
README.md
View File

@ -29,19 +29,14 @@ Or to some custom path:
make PREFIX=/some/custom/path install make PREFIX=/some/custom/path install
``` ```
## Ubuntu snap package ## archlinux
Not usable for now due to some limitation! AUR package for neovim-gtk https://aur.archlinux.org/packages/neovim-gtk-git
```shell
This package also includes neovim, so neovim not needed and if present in system - not used. Install command: 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 # Build
## Linux ## Linux

34
src/shell.rs
View File

@ -333,7 +333,7 @@ impl State {
let nvim = self.nvim(); let nvim = self.nvim();
if let Some(mut nvim) = nvim { if let Some(mut nvim) = nvim {
if self.mode.is(&mode::NvimMode::Insert) || self.mode.is(&mode::NvimMode::Normal) { 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); nvim.command(&paste_code).report_err(&mut *nvim);
} else { } else {
let paste_code = format!("<C-r>{}", clipboard); let paste_code = format!("<C-r>{}", clipboard);
@ -766,25 +766,19 @@ fn init_nvim_async(
}); });
// attach ui // attach ui
let mut nvim = Some(nvim); if let Err(err) = nvim::post_start_init(
glib::idle_add(move || { &mut nvim,
let mut nvim = nvim.take().unwrap(); options.open_path.as_ref(),
if let Err(err) = nvim::post_start_init( cols as u64,
&mut nvim, rows as u64,
options.open_path.as_ref(), )
cols as u64, {
rows as u64, show_nvim_init_error(&err, state_arc.clone());
) } else {
{ let mut state = state_arc.borrow_mut();
show_nvim_init_error(&err, state_arc.clone()); state.nvim.borrow_mut().set_initialized(nvim);
} else { state.cursor.as_mut().unwrap().start();
let mut state = state_arc.borrow_mut(); }
state.nvim.borrow_mut().set_initialized(nvim);
state.cursor.as_mut().unwrap().start();
}
Continue(false)
});
} }
fn draw_initializing(state: &State, ctx: &cairo::Context) { fn draw_initializing(state: &State, ctx: &cairo::Context) {