Mercurial > vim
comparison src/channel.c @ 19181:94eda51ba9ba v8.2.0149
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Commit: https://github.com/vim/vim/commit/8a7d6542b33e5d2b352262305c3bfdb2d14e1cf8
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 26 15:56:19 2020 +0100
patch 8.2.0149: maintaining a Vim9 branch separately is more work
Problem: Maintaining a Vim9 branch separately is more work.
Solution: Merge the Vim9 script changes.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 26 Jan 2020 16:00:05 +0100 |
| parents | c9258281045d |
| children | e7b4fff348dd |
comparison
equal
deleted
inserted
replaced
| 19180:8edf0aeb71b9 | 19181:94eda51ba9ba |
|---|---|
| 2261 jsonq_T *item = head->jq_next; | 2261 jsonq_T *item = head->jq_next; |
| 2262 | 2262 |
| 2263 while (item != NULL) | 2263 while (item != NULL) |
| 2264 { | 2264 { |
| 2265 list_T *l = item->jq_value->vval.v_list; | 2265 list_T *l = item->jq_value->vval.v_list; |
| 2266 typval_T *tv = &l->lv_first->li_tv; | 2266 typval_T *tv; |
| 2267 | |
| 2268 range_list_materialize(l); | |
| 2269 tv = &l->lv_first->li_tv; | |
| 2267 | 2270 |
| 2268 if ((without_callback || !item->jq_no_callback) | 2271 if ((without_callback || !item->jq_no_callback) |
| 2269 && ((id > 0 && tv->v_type == VAR_NUMBER && tv->vval.v_number == id) | 2272 && ((id > 0 && tv->v_type == VAR_NUMBER && tv->vval.v_number == id) |
| 2270 || (id <= 0 && (tv->v_type != VAR_NUMBER | 2273 || (id <= 0 && (tv->v_type != VAR_NUMBER |
| 2271 || tv->vval.v_number == 0 | 2274 || tv->vval.v_number == 0 |