diff options
| author | Florian Walch <florian@fwalch.com> | 2014-12-23 14:33:30 +0100 |
|---|---|---|
| committer | Florian Walch <florian@fwalch.com> | 2014-12-23 21:16:56 +0100 |
| commit | 75b7b04436b6db0885c162bd7eefcadf7766905d (patch) | |
| tree | a218c04fc60d79551dabd29a95834dda02f56483 /src | |
| parent | 2ba50a7846290ef399033a8ca34cbf60ef7a6b4e (diff) | |
| download | rneovim-75b7b04436b6db0885c162bd7eefcadf7766905d.tar.gz rneovim-75b7b04436b6db0885c162bd7eefcadf7766905d.tar.bz2 rneovim-75b7b04436b6db0885c162bd7eefcadf7766905d.zip | |
vim-patch:7.4.494
Problem: Cursor shape is wrong after a CompleteDone autocommand.
Solution: Update the cursor and mouse shape after ":normal" restores the
state. (Jacob Niehus)
https://code.google.com/p/vim/source/detail?r=v7-4-494
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_docmd.c | 5 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index f25af3f587..e4a8c2735b 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -70,6 +70,7 @@ #include "nvim/os/input.h" #include "nvim/os/time.h" #include "nvim/ex_cmds_defs.h" +#include "nvim/mouse.h" static int quitmore = 0; static int ex_pressedreturn = FALSE; @@ -7222,8 +7223,10 @@ static void ex_normal(exarg_T *eap) msg_didout |= save_msg_didout; /* don't reset msg_didout now */ /* Restore the state (needed when called from a function executed for - * 'indentexpr'). */ + * 'indentexpr'). Update the mouse and cursor, they may have changed. */ State = save_State; + setmouse(); + ui_cursor_shape(); /* may show different cursor shape */ free(arg); } diff --git a/src/nvim/version.c b/src/nvim/version.c index 0c2d831433..08862de715 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -244,7 +244,7 @@ static int included_patches[] = { //497, //496 NA //495 NA - //494, + 494, //493, //492, //491, |