Checking the position history only when option 'positionlog' is set.

This fixes a bug reported by Mike Frysinger.

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5597 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 25f65a9f7510857f5a41981f956f380d6709aedf..752649747bd57047938727a3d2054ce4b2214ccb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2016-01-29  Benno Schulenberg  <bensberg@justemail.net>
        * 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.
 
 2016-01-26  Benno Schulenberg  <bensberg@justemail.net>
        * src/files.c (update_poshistory): Do not add directories to the

diff --git a/src/nano.c b/src/nano.c
index 00faa80646206a0f4f84e7a77478b51ada78ea31..4dd3e0cbb6aeea3cacb386f856f55c68c1370e3d 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -2628,7 +2628,7 @@ int main(int argc, char **argv)
                    icol = 0;
                }
 #ifndef DISABLE_HISTORIES
-               else {
+               else if (ISSET(POS_HISTORY)) {
                    ssize_t savedposline, savedposcol;
                    /* If edited before, restore the last cursor position. */
                    if (check_poshistory(argv[i], &savedposline, &savedposcol))