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 457ba7f356aab4ebd92785287613ae8d9002d1c5..3d38021a9f18a35bbdda57764b0286565ce70d14 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,8 @@
 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.
+       * 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  <bensberg@justemail.net>

diff --git a/src/nano.c b/src/nano.c
index 4dd3e0cbb6aeea3cacb386f856f55c68c1370e3d..a50aeb031dfa1182173f845d41667b0ada2487b3 100644 (file)
--- 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))