diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-02-15 11:48:22 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-02-15 11:48:22 +0000 |
| commit | 7745f14ef324a7134b2f26a47451cf5032f44b89 (patch) | |
| tree | 9e4e39dd7a3de7a40352e0aac494ae5bacec3c32 | |
| parent | e3846cf1ebdc4af0b39885153b4703f71a9b919e (diff) | |
patch 8.2.4388: dead code in op_insert()v8.2.4388
Problem: Dead code in op_insert().
Solution: Remove condition and else block. (closes #9782)
| -rw-r--r-- | src/ops.c | 37 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 16 insertions, 23 deletions
@@ -1586,35 +1586,26 @@ op_insert(oparg_T *oap, long count1) int t = getviscol2(curbuf->b_op_start_orig.col, curbuf->b_op_start_orig.coladd); - if (!bd.is_MAX) - { - if (oap->op_type == OP_INSERT - && oap->start.col + oap->start.coladd - != curbuf->b_op_start_orig.col + if (oap->op_type == OP_INSERT + && oap->start.col + oap->start.coladd + != curbuf->b_op_start_orig.col + curbuf->b_op_start_orig.coladd) - { - oap->start.col = curbuf->b_op_start_orig.col; - pre_textlen -= t - oap->start_vcol; - oap->start_vcol = t; - } - else if (oap->op_type == OP_APPEND - && oap->start.col + oap->start.coladd - >= curbuf->b_op_start_orig.col - + curbuf->b_op_start_orig.coladd) - { - oap->start.col = curbuf->b_op_start_orig.col; - // reset pre_textlen to the value of OP_INSERT - pre_textlen += bd.textlen; - pre_textlen -= t - oap->start_vcol; - oap->start_vcol = t; - oap->op_type = OP_INSERT; - } + { + oap->start.col = curbuf->b_op_start_orig.col; + pre_textlen -= t - oap->start_vcol; + oap->start_vcol = t; } - else if (bd.is_MAX && oap->op_type == OP_APPEND) + else if (oap->op_type == OP_APPEND + && oap->start.col + oap->start.coladd + >= curbuf->b_op_start_orig.col + + curbuf->b_op_start_orig.coladd) { + oap->start.col = curbuf->b_op_start_orig.col; // reset pre_textlen to the value of OP_INSERT pre_textlen += bd.textlen; pre_textlen -= t - oap->start_vcol; + oap->start_vcol = t; + oap->op_type = OP_INSERT; } } diff --git a/src/version.c b/src/version.c index eca2c748e8..559b6022d8 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4388, +/**/ 4387, /**/ 4386, |