From: Benno Schulenberg Date: Fri, 29 Jan 2016 17:18:27 +0000 (+0000) Subject: Checking the position history only when 'positionlog' is set X-Git-Tag: v2.5.2~36 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=98e72f50e67ba6acaff077bb1bafdbe9aae0f714;p=nano.git 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 --- diff --git a/ChangeLog b/ChangeLog index 457ba7f3..3d38021a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,8 @@ 2016-01-29 Benno Schulenberg * src/files.c (do_insertfile): Do display the buffer when configured with only --disable-histories. This fixes Savannah bug #47011. - * src/nano.c (main): For second or later files on the command line, - only check the position history when option 'positionlog' is set. - This fixes a bug that was unconsciously reported by Mike Frysinger. + * src/nano.c (main): Check position history only when 'positionlog' + is set. This fixes a bug unconsciously reported by Mike Frysinger. * src/files.c (do_lockfile): Plug a couple of memory leaks. 2016-01-26 Benno Schulenberg diff --git a/src/nano.c b/src/nano.c index 4dd3e0cb..a50aeb03 100644 --- a/src/nano.c +++ b/src/nano.c @@ -2666,7 +2666,7 @@ int main(int argc, char **argv) if (startline > 0 || startcol > 0) do_gotolinecolumn(startline, startcol, FALSE, FALSE); #ifndef DISABLE_HISTORIES - else { + else if (ISSET(POS_HISTORY)) { ssize_t savedposline, savedposcol; /* If the file was edited before, restore the last cursor position. */ if (check_poshistory(argv[optind], &savedposline, &savedposcol))