mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Benno Schulenberg 2016-01-29 16:01:43 +00:00
parent a93a11eb42
commit d8801ec10e
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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.

17
src/files.c
View File

@ -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;