From: Chris Allegretta <chrisa@asty.org>
Date: Sun, 26 Jan 2014 22:47:08 +0000 (+0000)
Subject: 2014-01-24 Benno Schulenberg <bens>
X-Git-Tag: v2.3.3~345
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=c218415212a7424c12fe27d3ea670b4c45e364dc;p=nano.git

2014-01-24 Benno Schulenberg <bens>
        * src/nano.c (copy_from_filestruct) - Check explicitly for mark being set when
          trying to partition, as we shouldn't be messing with the x address, etc.



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

diff --git a/ChangeLog b/ChangeLog
index 84b8295a..c073dffc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-24 Benno Schulenberg <bens>
+	* src/nano.c (copy_from_filestruct) - Check explicitly for mark being set when
+	  trying to partition, as we shouldn't be messing with the x address, etc.
+
 2014-01-25 Chris Allegretta <chrisa@asty.org>
 	* src/winio.c (set_modified) - Check for a filename before we bother trying to lock
 
diff --git a/src/nano.c b/src/nano.c
index ccd62786..08c8441f 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -465,7 +465,12 @@ void copy_from_filestruct(filestruct *file_top, filestruct *file_bot)
     }
 #ifndef NANO_TINY
     else if (openfile->mark_set) {
-	if (!right_side_up) {
+	if (right_side_up) {
+	    if (single_line)
+		/* get the new data, stuff was inserted on mark line */
+		openfile->mark_begin = openfile->fileage;
+		/* the x is okay, it did not move */
+	} else {
 	    if (single_line) {
 		openfile->mark_begin = openfile->current;
 		openfile->mark_begin_x -= current_x_save;