aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/search.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/search.c')
-rw-r--r--src/search.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/src/search.c b/src/search.c
index db85283..22dc726 100644
--- a/src/search.c
+++ b/src/search.c
@@ -35,6 +35,7 @@
#include "parser.h"
#include "core-commands.h"
#include "error.h"
+#include "cmdline.h"
#include "search.h"
typedef struct {
@@ -60,7 +61,12 @@ teco_state_search_initial(teco_machine_main_t *ctx, GError **error)
if (ctx->mode > TECO_MODE_NORMAL)
return TRUE;
- teco_undo_guint(ctx->expectstring.machine.codepage) = teco_interface_get_codepage();
+ /*
+ * NOTE: This is not safe to undo in macro calls.
+ */
+ if (ctx == &teco_cmdline.machine)
+ teco_undo_guint(ctx->expectstring.machine.codepage);
+ ctx->expectstring.machine.codepage = teco_interface_get_codepage();
if (G_UNLIKELY(!teco_search_qreg_machine))
teco_search_qreg_machine = teco_machine_qregspec_new(TECO_QREG_REQUIRED, ctx->qreg_table_locals,
@@ -1046,8 +1052,15 @@ TECO_DEFINE_STATE_SEARCH(teco_state_search_delete);
static gboolean
teco_state_replace_insert_initial(teco_machine_main_t *ctx, GError **error)
{
- if (ctx->mode == TECO_MODE_NORMAL)
- teco_undo_guint(ctx->expectstring.machine.codepage) = teco_interface_get_codepage();
+ if (ctx->mode > TECO_MODE_NORMAL)
+ return TRUE;
+
+ /*
+ * NOTE: This is not safe to undo in macro calls.
+ */
+ if (ctx == &teco_cmdline.machine)
+ teco_undo_guint(ctx->expectstring.machine.codepage);
+ ctx->expectstring.machine.codepage = teco_interface_get_codepage();
return TRUE;
}