`ER` updates ^S/^Y now as any other text insertionHEADmaster-fmsbw-cimaster

2 files changed, 9 insertions, 1 deletions

diff --git a/src/ring.c b/src/ring.c
index 2445718..5eb16e6 100644
--- a/src/ring.c
+++ b/src/ring.c
@@ -731,13 +731,18 @@ teco_state_read_file_done(teco_machine_main_t *ctx, teco_string_t str, GError **
 		return &teco_state_start;
 
 	sptr_t pos = teco_interface_ssm(SCI_GETCURRENTPOS, 0, 0);
+	teco_undo_int(teco_ranges[0].from) = teco_interface_bytes2glyphs(pos);
 
 	g_autofree gchar *filename = teco_file_expand_path(str.data);
 	/* FIXME: Add wrapper to interface.h? */
 	if (!teco_view_load(teco_interface_current_view, filename, FALSE, error))
 		return NULL;
 
-	if (teco_interface_ssm(SCI_GETCURRENTPOS, 0, 0) != pos) {
+	pos = teco_interface_ssm(SCI_GETCURRENTPOS, 0, 0);
+	teco_undo_int(teco_ranges[0].to) = teco_interface_bytes2glyphs(pos);
+	teco_undo_guint(teco_ranges_count) = 1;
+
+	if (teco_ranges[0].from != teco_ranges[0].to) {
 		teco_ring_dirtify();
 
 		if (teco_current_doc_must_undo())
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 23e2dab..8145e3d 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -296,6 +296,9 @@ TE_CHECK([[@I/ABCDEF/J @FS/ABC/1234/ ^S+4"N(0/0)']], 0, ignore, ignore)
 TE_CHECK([[@^Ua/XYZ/ Ga ^S+3"N(0/0)']], 0, ignore, ignore)
 # NOTE: EN currently inserts another trailing linefeed.
 TE_CHECK([[@EN/*/XYZ/ ^S+4"N(0/0)']], 0, ignore, ignore)
+AT_DATA([test.txt], [[0123456789
+]])
+TE_CHECK([[@ER"test.txt" ^S+11"N(0/0)']], 0, ignore, ignore)
 AT_CLEANUP
 
 AT_SETUP([Editing local registers in macro calls])