From: Benno Schulenberg <bensberg@justemail.net>
Date: Tue, 12 Jan 2016 11:16:39 +0000 (+0000)
Subject: Rename a variable, to match the save routine.
X-Git-Tag: v2.5.2~86
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=583b67bad2bce10940878be4f68fb8a9f8f2cd91;p=nano.git

Rename a variable, to match the save routine.


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

diff --git a/ChangeLog b/ChangeLog
index a9224993..a0f256a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2016-01-12  Benno Schulenberg  <bensberg@justemail.net>
 	* NEWS: Fix some typos and whitespace, and normalize the dates.
+	* src/files.c (load_poshistory): Rename a variable.
 
 GNU nano 2.5.1 - 2016.01.11
 
diff --git a/src/files.c b/src/files.c
index de1c050a..b43fbea2 100644
--- a/src/files.c
+++ b/src/files.c
@@ -3200,17 +3200,17 @@ int check_poshistory(const char *file, ssize_t *line, ssize_t *column)
 /* Load the recorded file positions from ~/.nano/filepos_history. */
 void load_poshistory(void)
 {
-    char *nanohist = poshistfilename();
+    char *poshist = poshistfilename();
 
     /* Assume do_rcfile() has reported a missing home directory. */
-    if (nanohist != NULL) {
-	FILE *hist = fopen(nanohist, "rb");
+    if (poshist != NULL) {
+	FILE *hist = fopen(poshist, "rb");
 
 	if (hist == NULL) {
 	    if (errno != ENOENT) {
 		/* Don't save history when we quit. */
 		UNSET(POS_HISTORY);
-		history_error(N_("Error reading %s: %s"), nanohist,
+		history_error(N_("Error reading %s: %s"), poshist,
 			strerror(errno));
 	    }
 	} else {
@@ -3252,7 +3252,7 @@ void load_poshistory(void)
 	    fclose(hist);
 	    free(line);
 	}
-	free(nanohist);
+	free(poshist);
     }
 }
 #endif /* !DISABLE_HISTORIES */