diff options
Diffstat (limited to 'src/qreg-commands.c')
| -rw-r--r-- | src/qreg-commands.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/src/qreg-commands.c b/src/qreg-commands.c index 4ede403..a6390a1 100644 --- a/src/qreg-commands.c +++ b/src/qreg-commands.c @@ -572,9 +572,11 @@ teco_state_getqregstring_got_register(teco_machine_main_t *ctx, teco_qreg_t *qre undo__teco_interface_ssm(SCI_UNDO, 0, 0); } - teco_undo_int(teco_ranges[0].from) = teco_interface_bytes2glyphs(pos); - teco_undo_int(teco_ranges[0].to) = teco_interface_bytes2glyphs(pos + str.len); + teco_undo_int(teco_ranges[0].from) = teco_current_doc_get_dot(); + teco_int_t to = teco_interface_bytes2glyphs_rel(teco_ranges[0].from, pos, str.len); + teco_undo_int(teco_ranges[0].to) = to; teco_undo_guint(teco_ranges_count) = 1; + teco_current_doc_set_dot(to); return &teco_state_start; } @@ -609,7 +611,6 @@ teco_state_setqreginteger_got_register(teco_machine_main_t *ctx, teco_qreg_t *qr if (teco_expressions_args() || teco_num_sign < 0) { teco_int_t v; if (!teco_expressions_pop_num_calc(&v, teco_num_sign, error) || - !qreg->vtable->undo_set_integer(qreg, error) || !qreg->vtable->set_integer(qreg, v, error)) return NULL; @@ -657,8 +658,7 @@ teco_state_increaseqreg_got_register(teco_machine_main_t *ctx, teco_qreg_t *qreg teco_int_t value, add; - if (!qreg->vtable->undo_set_integer(qreg, error) || - !qreg->vtable->get_integer(qreg, &value, error) || + if (!qreg->vtable->get_integer(qreg, &value, error) || !teco_expressions_pop_num_calc(&add, teco_num_sign, error) || !qreg->vtable->set_integer(qreg, value += add, error)) return NULL; @@ -798,9 +798,10 @@ teco_state_copytoqreg_got_register(teco_machine_main_t *ctx, teco_qreg_t *qreg, if (ctx->flags.mode > TECO_MODE_NORMAL) return &teco_state_start; + teco_int_t from_glyphs, len_glyphs; gsize from, len; - if (!teco_get_range_args("X", &from, &len, error)) + if (!teco_get_range_args("X", &from_glyphs, &from, &len_glyphs, &len, error)) return NULL; /* @@ -829,11 +830,12 @@ teco_state_copytoqreg_got_register(teco_machine_main_t *ctx, teco_qreg_t *qreg, if (!modifier_at || len == 0) return &teco_state_start; + sptr_t pos = teco_interface_ssm(SCI_GETCURRENTPOS, 0, 0); + /* * If @-modified, cut into the register */ if (teco_current_doc_must_undo()) { - sptr_t pos = teco_interface_ssm(SCI_GETCURRENTPOS, 0, 0); undo__teco_interface_ssm(SCI_GOTOPOS, pos, 0); undo__teco_interface_ssm(SCI_UNDO, 0, 0); } @@ -846,6 +848,13 @@ teco_state_copytoqreg_got_register(teco_machine_main_t *ctx, teco_qreg_t *qreg, teco_interface_ssm(SCI_ENDUNDOACTION, 0, 0); teco_ring_dirtify(); + if (from+len < pos) + /* dot after deleted range */ + teco_current_doc_set_dot(teco_current_doc_get_dot() - len_glyphs); + else if (from <= pos) + /* dot falls on deleted range */ + teco_current_doc_set_dot(from_glyphs); + return &teco_state_start; } |