diff --unidirectional-new-file -U 0 -rx .svn nano_2_3_2/ChangeLog trunk/nano/ChangeLog --- nano_2_3_2/ChangeLog 2013-06-09 13:15:58.000000000 +0200 +++ trunk/nano/ChangeLog 2013-06-09 13:14:53.000000000 +0200 @@ -0,0 +1,12 @@ +2013-04-12 Chris Allegretta + * src/files.c (do_insertfile): Check for saved cursor position when inserting a + file as well. Fixes Savannah bug 38600 reported by Craig Barnes. + * src/files.c (write_file): Don't re-stat() the file if we're writing out + a marked file (especially that would give it the wrong stat info). Part + 2 of issue reported by Benno Schulenberg. + +2013-04-07 Michael Berg + * do_cut_text - Fix copying (not cutting) text setting Modified state. Fixes + issue reported by Benno Schulenberg. + +GNU nano 2.3.2 - 2011.03.23 diff --unidirectional-new-file -U 0 -rx .svn nano_2_3_2/configure.ac trunk/nano/configure.ac --- nano_2_3_2/configure.ac 2013-06-09 13:15:58.000000000 +0200 +++ trunk/nano/configure.ac 2013-06-09 13:14:53.000000000 +0200 @@ -23 +23 @@ -AC_INIT([GNU nano], [2.3.2], [nano-devel@gnu.org], [nano]) +AC_INIT([GNU nano], [2.3.2-svn], [nano-devel@gnu.org], [nano]) diff --unidirectional-new-file -U 0 -rx .svn nano_2_3_2/src/cut.c trunk/nano/src/cut.c --- nano_2_3_2/src/cut.c 2013-06-09 13:15:57.000000000 +0200 +++ trunk/nano/src/cut.c 2013-06-09 13:14:51.000000000 +0200 @@ -212 +212,3 @@ - set_modified(); + if (!copy_text) { + set_modified(); + } diff --unidirectional-new-file -U 0 -rx .svn nano_2_3_2/src/files.c trunk/nano/src/files.c --- nano_2_3_2/src/files.c 2013-06-09 13:15:57.000000000 +0200 +++ trunk/nano/src/files.c 2013-06-09 13:14:51.000000000 +0200 @@ -1198 +1198 @@ - if (ISSET(MULTIBUFFER)) + if (ISSET(MULTIBUFFER)) { @@ -1200,0 +1201,2 @@ + ssize_t savedposline, savedposcol; + @@ -1202 +1204,4 @@ - else + if (!execute && ISSET(POS_HISTORY) + && check_poshistory(answer, &savedposline, &savedposcol)) + do_gotolinecolumn(savedposline, savedposcol, FALSE, FALSE, FALSE, FALSE); + } else @@ -2137 +2142,2 @@ - stat(realname, openfile->current_stat); + if (!openfile->mark_set) + stat(realname, openfile->current_stat); @@ -3198 +3204 @@ - UNSET(HISTORYLOG); + UNSET(POS_HISTORY);