nano

commit 287f78a26b83ae35bba0f74c547a3edc28b3cf34
parent 8a2dd978f873bfb10e96441062247b9c639dc4dc
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Tue, 23 Feb 2016 12:07:58 +0000

Not moving the cursor when copying a backwardly marked region.
This fixes Savannah bug #46980.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5671 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

Diffstat:
M
ChangeLog
 | 
2
++
M
src/cut.c
 | 
12
++++++++++++

2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,8 @@
 2016-02-23  Benno Schulenberg  <bensberg@justemail.net>
 	* src/prompt.c (do_statusbar_output, do_statusbar_delete):
 	Rename a variable, for contrast and correctness.
+	* src/cut.c (do_copy_text): Don't move the cursor when copying a
+	backwardly marked region.  This fixes Savannah bug #46980.
 
 2016-02-22  Chris Allegretta <chrisa@asty.org>
 	* Add ability to kill the trailing spaces when justifying
diff --git a/src/cut.c b/src/cut.c
@@ -237,6 +237,11 @@ void do_copy_text(void)
     static struct filestruct *next_contiguous_line = NULL;
     bool mark_set = openfile->mark_set;
 
+    /* Remember the current view port and cursor position. */
+    ssize_t is_edittop_lineno = openfile->edittop->lineno;
+    ssize_t is_current_lineno = openfile->current->lineno;
+    size_t is_current_x = openfile->current_x;
+
     if (mark_set || openfile->current != next_contiguous_line)
 	cutbuffer_reset();
 
@@ -244,6 +249,13 @@ void do_copy_text(void)
 
     /* If the mark was set, blow away the cutbuffer on the next copy. */
     next_contiguous_line = (mark_set ? NULL : openfile->current);
+
+    if (mark_set) {
+	/* Restore the view port and cursor position. */
+	openfile->edittop = fsfromline(is_edittop_lineno);
+	openfile->current = fsfromline(is_current_lineno);
+	openfile->current_x = is_current_x;
+    }
 }
 
 /* Cut from the current cursor position to the end of the file. */