mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Chris Allegretta 2014-01-26 22:47:08 +00:00
parent d2f29d0243
commit c218415212
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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

7
src/nano.c
View File

@ -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;