From d714bb48a4b8629f6345a28bc21a24537207176b Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Wed, 16 Oct 2024 11:40:52 +0300 Subject: fixup: use teco_machine_t::must_undo instead of trying to identify the current state machine * The previous solution was not wrong, but unnecessarily complex. We already have a flag for exactly this purpose. * Avoid redundancies by introducing teco_machine_stringbuilding_set_codepage(). --- src/qreg-commands.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/qreg-commands.c') diff --git a/src/qreg-commands.c b/src/qreg-commands.c index f8bb4cb..cff4c84 100644 --- a/src/qreg-commands.c +++ b/src/qreg-commands.c @@ -29,7 +29,6 @@ #include "interface.h" #include "ring.h" #include "parser.h" -#include "cmdline.h" #include "core-commands.h" #include "qreg.h" #include "qreg-commands.h" @@ -493,12 +492,12 @@ teco_state_setqregstring_building_initial(teco_machine_main_t *ctx, GError **err /* * The expected codepage of string building constructs is determined * by the Q-Register. - * - * NOTE: This is not safe to undo in macro calls. */ - if (ctx == &teco_cmdline.machine) - teco_undo_guint(ctx->expectstring.machine.codepage); - return qreg->vtable->get_string(qreg, NULL, NULL, &ctx->expectstring.machine.codepage, error); + guint codepage; + if (!qreg->vtable->get_string(qreg, NULL, NULL, &codepage, error)) + return FALSE; + teco_machine_stringbuilding_set_codepage(&ctx->expectstring.machine, codepage); + return TRUE; } static teco_state_t * -- cgit v1.2.3