editor: fix current address when moving a single line

When moving a single line, we only want to return the destination line.
nmeum · Aug 17, 2023 · 7f85285 · 7f85285
1 parent 3784b5c
commit 7f85285
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/lib/ed/editor.scm b/lib/ed/editor.scm
@@ -452,7 +452,11 @@
     (buffer-move! buffer sline eline dest-line)
     (min
       (editor-lines editor)
-      (+ dest-line (inc (- eline sline))))))
+      (let ((diff (- eline sline)))
+        (+ dest-line
+           ;; If we moved multiple lines, we need to increment
+           ;; the destination lines by the amount of lines moved.
+           (if (zero? diff) diff (inc diff)))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 

diff --git a/tests/integration/move-update-current-on-single-line/cmds b/tests/integration/move-update-current-on-single-line/cmds
@@ -0,0 +1,3 @@
+2m3
+.=
+Q
diff --git a/tests/integration/move-update-current-on-single-line/opts b/tests/integration/move-update-current-on-single-line/opts
@@ -0,0 +1 @@
+testdata/input-file
diff --git a/tests/integration/move-update-current-on-single-line/testdata/input-file b/tests/integration/move-update-current-on-single-line/testdata/input-file
@@ -0,0 +1,5 @@
+foo
+bar
+baz
+bla
+blubb