From 8fedd523deb07a33fc6ef786d57fd904ffecc8f5 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Fri, 18 Oct 2024 14:28:08 +0300 Subject: fixed the "Editing local registers in macro calls" check * The previous check could result in false positives if you are editing a local Q-Register, that will be destroyed at the end of the current macro frame, and call another non-colon modified macro. * It must instead be invalid to keep the register edited only if it belongs to the local Q-Registers that are about to be freed. In other words, the table that the currently edited Q-Register belongs to, must be the one we're about to destroy. * This fixes the solarized.toggle (F5) macro when using the Solarized color scheme. --- src/qreg.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/qreg.c') diff --git a/src/qreg.c b/src/qreg.c index c337dbe..a0e5415 100644 --- a/src/qreg.c +++ b/src/qreg.c @@ -47,6 +47,8 @@ * Initialized in main.c after the interface. */ teco_view_t *teco_qreg_view = NULL; +/** Table of currently edited Q-Register */ +const teco_qreg_table_t *teco_qreg_table_current = NULL; /** Currently edited Q-Register */ teco_qreg_t *teco_qreg_current = NULL; @@ -1234,8 +1236,8 @@ teco_ed_hook(teco_ed_hook_t type, GError **error) if (!teco_qreg_execute(qreg, &locals, error)) goto error_add_frame; - if (teco_qreg_current && !teco_qreg_current->must_undo) { - /* currently editing local Q-Register */ + if (teco_qreg_table_current == &locals) { + /* currently editing local Q-Register that's about to be freed */ teco_error_editinglocalqreg_set(error, teco_qreg_current->head.name.data, teco_qreg_current->head.name.len); goto error_add_frame; -- cgit v1.2.3