ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Checking the position history only when 'positionlog' is set 

/also/ for the first file.  :|


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5599 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2016-01-29 17:18:27 +00:00
parent 41f08534d9
commit 98e72f50e6
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,9 +1,8 @@
2016-01-29 Benno Schulenberg <bensberg@justemail.net> 2016-01-29 Benno Schulenberg <bensberg@justemail.net>
* src/files.c (do_insertfile): Do display the buffer when configured * src/files.c (do_insertfile): Do display the buffer when configured
with only --disable-histories. This fixes Savannah bug #47011. with only --disable-histories. This fixes Savannah bug #47011.
* src/nano.c (main): For second or later files on the command line, * src/nano.c (main): Check position history only when 'positionlog'
only check the position history when option 'positionlog' is set. is set. This fixes a bug unconsciously reported by Mike Frysinger.
This fixes a bug that was unconsciously reported by Mike Frysinger.
* src/files.c (do_lockfile): Plug a couple of memory leaks. * src/files.c (do_lockfile): Plug a couple of memory leaks.
2016-01-26 Benno Schulenberg <bensberg@justemail.net> 2016-01-26 Benno Schulenberg <bensberg@justemail.net>

2
src/nano.c
View File

@ -2666,7 +2666,7 @@ int main(int argc, char **argv)
if (startline > 0 || startcol > 0) if (startline > 0 || startcol > 0)
do_gotolinecolumn(startline, startcol, FALSE, FALSE); do_gotolinecolumn(startline, startcol, FALSE, FALSE);
#ifndef DISABLE_HISTORIES #ifndef DISABLE_HISTORIES
else { else if (ISSET(POS_HISTORY)) {
ssize_t savedposline, savedposcol; ssize_t savedposline, savedposcol;
/* If the file was edited before, restore the last cursor position. */ /* If the file was edited before, restore the last cursor position. */
if (check_poshistory(argv[optind], &savedposline, &savedposcol)) if (check_poshistory(argv[optind], &savedposline, &savedposcol))