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

2013-04-12 Chris Allegretta <chrisa@asty.org> 

* src/files.c (do_insertfile): Check for saved cursor position when inserting a
          file as well.  Fixes Savannah bug 38600 reported by Craig Barnes.



git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4574 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Chris Allegretta 2013-04-12 06:43:06 +00:00
parent 4cc4b9ba08
commit 6251358746
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2013-04-12 Chris Allegretta <chrisa@asty.org>
* src/files.c (do_insertfile): Check for saved cursor position when inserting a
file as well. Fixes Savannah bug 38600 reported by Craig Barnes.
2013-04-07 Michael Berg <mike@berg-net.us>
* do_cut_text - Fix copying (not cutting) text setting Modified state. Fixes
issue reported by Benno Schulenberg.

11
src/files.c
View File

@ -1195,11 +1195,16 @@ void do_insertfile(
#endif
#ifdef ENABLE_MULTIBUFFER
if (ISSET(MULTIBUFFER))
if (ISSET(MULTIBUFFER)) {
/* Update the screen to account for the current
* buffer. */
ssize_t savedposline, savedposcol;
display_buffer();
else
if (!execute && ISSET(POS_HISTORY)
&& check_poshistory(answer, &savedposline, &savedposcol))
do_gotolinecolumn(savedposline, savedposcol, FALSE, FALSE, FALSE, FALSE);
} else
#endif
{
filestruct *top_save = openfile->fileage;
@ -3195,7 +3200,7 @@ void load_poshistory(void)
if (hist == NULL) {
if (errno != ENOENT) {
/* Don't save history when we quit. */
UNSET(HISTORYLOG);
UNSET(POS_HISTORY);
history_error(N_("Error reading %s: %s"), nanohist,
strerror(errno));
}