From: Benno Schulenberg <bensberg@justemail.net>
Date: Fri, 29 Jan 2016 16:20:28 +0000 (+0000)
Subject: Checking the position history only when option 'positionlog' is set.
X-Git-Tag: v2.5.2~38
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f8ed6bb09913135c5930dac7b9541136ea60fd17;p=nano.git

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 25f65a9f..75264974 100644
--- 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 00faa806..4dd3e0cb 100644
--- 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))