diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2014-06-04 07:13:05 +0000 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2014-06-04 07:13:05 +0000 |
commit | 862a25f96e805aa7ef0912c3d50530a3eb350aeb (patch) | |
tree | 5bf485e9edca845f79821a9de8dc8cf7888c3ffb /src | |
parent | d5c2cee1b7aa4847b1e5269a0fa96a0114304aa1 (diff) | |
parent | e8b4fc53fc1d9ddd1c1faca45bc41fc9ff750278 (diff) | |
download | rneovim-862a25f96e805aa7ef0912c3d50530a3eb350aeb.tar.gz rneovim-862a25f96e805aa7ef0912c3d50530a3eb350aeb.tar.bz2 rneovim-862a25f96e805aa7ef0912c3d50530a3eb350aeb.zip |
Merge #738 'vim-patch:7.4.275'
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/ex_cmds.c | 5 | ||||
-rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index 2d62d1bc71..576847c7b9 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -6026,7 +6026,10 @@ void ex_sign(exarg_T *eap) else /* ":sign place {id} file={fname}": change sign type */ lnum = buf_change_sign_type(buf, id, sp->sn_typenr); - update_debug_sign(buf, lnum); + if (lnum > 0) + update_debug_sign(buf, lnum); + else + EMSG2(_("E885: Not possible to change sign %s"), sign_name); } else EMSG(_(e_invarg)); diff --git a/src/nvim/version.c b/src/nvim/version.c index 6354306a08..40ba96c758 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -212,7 +212,7 @@ static int included_patches[] = { //278, 277, //276, - //275, + 275, 274, //273, 272, |