From: Benno Schulenberg <bensberg@justemail.net>
Date: Fri, 29 Jan 2016 16:01:43 +0000 (+0000)
Subject: Also displaying the buffer when configured with only --disable-histories.
X-Git-Tag: v2.5.2~39
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d8801ec10ef80dd13d13f709ebc3036857d37bd2;p=nano.git

Also displaying the buffer when configured with only --disable-histories.
This fixes a segfault reported in Savannah bug #47011.


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

diff --git a/ChangeLog b/ChangeLog
index a12d5935..25f65a9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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.
+
 2016-01-26  Benno Schulenberg  <bensberg@justemail.net>
 	* src/files.c (update_poshistory): Do not add directories to the
 	list of file positions.  This fixes Savannah bug #46971.
diff --git a/src/files.c b/src/files.c
index d9533d9d..0a4b4de8 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1240,20 +1240,23 @@ void do_insertfile(
 		open_buffer(answer, TRUE);
 	    }
 
-#if !defined(DISABLE_MULTIBUFFER) && !defined(DISABLE_HISTORIES)
+#ifndef DISABLE_MULTIBUFFER
 	    if (ISSET(MULTIBUFFER)) {
 		/* Update the screen to account for the current buffer. */
 		display_buffer();
 
-		ssize_t savedposline, savedposcol;
-		if (ISSET(POS_HISTORY) &&
+#ifndef DISABLE_HISTORIES
+		if (ISSET(POS_HISTORY)) {
+		    ssize_t priorline, priorcol;
 #ifndef NANO_TINY
-			!execute &&
+		    if (!execute)
 #endif
-			check_poshistory(answer, &savedposline, &savedposcol))
-		    do_gotolinecolumn(savedposline, savedposcol, FALSE, FALSE);
+		    if (check_poshistory(answer, &priorline, &priorcol))
+			do_gotolinecolumn(priorline, priorcol, FALSE, FALSE);
+		}
+#endif /* !DISABLE_HISTORIES */
 	    } else
-#endif /* !DISABLE_MULTIBUFFER && !DISABLE_HISTORIES */
+#endif /* !DISABLE_MULTIBUFFER */
 	    {
 		filestruct *top_save = openfile->fileage;