Mercurial > vim
comparison src/blob.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 | c469e1930456 |
children | 9e249065aeac |
comparison
equal
deleted
inserted
replaced
19180:8edf0aeb71b9 | 19181:94eda51ba9ba |
---|---|
56 if (b != NULL) | 56 if (b != NULL) |
57 ++b->bv_refcount; | 57 ++b->bv_refcount; |
58 } | 58 } |
59 | 59 |
60 int | 60 int |
61 blob_copy(typval_T *from, typval_T *to) | 61 blob_copy(blob_T *from, typval_T *to) |
62 { | 62 { |
63 int ret = OK; | 63 int ret = OK; |
64 | 64 |
65 to->v_type = VAR_BLOB; | 65 to->v_type = VAR_BLOB; |
66 to->v_lock = 0; | 66 to->v_lock = 0; |
67 if (from->vval.v_blob == NULL) | 67 if (from == NULL) |
68 to->vval.v_blob = NULL; | 68 to->vval.v_blob = NULL; |
69 else if (rettv_blob_alloc(to) == FAIL) | 69 else if (rettv_blob_alloc(to) == FAIL) |
70 ret = FAIL; | 70 ret = FAIL; |
71 else | 71 else |
72 { | 72 { |
73 int len = from->vval.v_blob->bv_ga.ga_len; | 73 int len = from->bv_ga.ga_len; |
74 | 74 |
75 if (len > 0) | 75 if (len > 0) |
76 { | 76 { |
77 to->vval.v_blob->bv_ga.ga_data = | 77 to->vval.v_blob->bv_ga.ga_data = |
78 vim_memsave(from->vval.v_blob->bv_ga.ga_data, len); | 78 vim_memsave(from->bv_ga.ga_data, len); |
79 if (to->vval.v_blob->bv_ga.ga_data == NULL) | 79 if (to->vval.v_blob->bv_ga.ga_data == NULL) |
80 len = 0; | 80 len = 0; |
81 } | 81 } |
82 to->vval.v_blob->bv_ga.ga_len = len; | 82 to->vval.v_blob->bv_ga.ga_len = len; |
83 } | 83 } |