diff options
author | Matthieu Coudron <mattator@gmail.com> | 2020-04-27 13:53:41 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-27 13:53:41 +0200 |
commit | d90a92bcd3c18111abb62a57192c9e151839a7f4 (patch) | |
tree | e9b9163c0896aa099f7c543c76197d28dbfdc5d3 /src/nvim/eval.c | |
parent | fc98f2d5815d8f7e671766db255edbb7365960b1 (diff) | |
parent | fcd9ce39012c9328b999c4ccb7eaa7c22766168e (diff) | |
download | rneovim-d90a92bcd3c18111abb62a57192c9e151839a7f4.tar.gz rneovim-d90a92bcd3c18111abb62a57192c9e151839a7f4.tar.bz2 rneovim-d90a92bcd3c18111abb62a57192c9e151839a7f4.zip |
Merge pull request #12018 from janlazo/vim-8.0.1123
[RFC]vim-patch:8.0.{1123,1125,1138,1139,1142,1292,1334,1375},8.1.1264
Diffstat (limited to 'src/nvim/eval.c')
-rw-r--r-- | src/nvim/eval.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index b8ec94999a..a6162af472 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -6305,6 +6305,7 @@ dict_T *get_win_info(win_T *wp, int16_t tpnr, int16_t winnr) tv_dict_add_nr(dict, S_LEN("winrow"), wp->w_winrow + 1); tv_dict_add_nr(dict, S_LEN("topline"), wp->w_topline); tv_dict_add_nr(dict, S_LEN("botline"), wp->w_botline - 1); + tv_dict_add_nr(dict, S_LEN("winbar"), wp->w_winbar_height); tv_dict_add_nr(dict, S_LEN("width"), wp->w_width); tv_dict_add_nr(dict, S_LEN("bufnr"), wp->w_buffer->b_fnum); tv_dict_add_nr(dict, S_LEN("wincol"), wp->w_wincol + 1); @@ -9258,13 +9259,7 @@ void ex_echo(exarg_T *eap) */ void ex_echohl(exarg_T *eap) { - int id; - - id = syn_name2id(eap->arg); - if (id == 0) - echo_attr = 0; - else - echo_attr = syn_id2attr(id); + echo_attr = syn_name2attr(eap->arg); } /* |