From d6e39724d81a7cd640be7415b1ac04b4940c4bed Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Sat, 22 Feb 2014 16:26:30 +0000 Subject: [PATCH] Adding four needed compilation conditions on ENABLE_NANORC. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4590 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 6 ++++++ src/files.c | 6 +++--- src/nano.c | 8 ++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e50d6f6..b6f4c1e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-02-22 Benno Schulenberg + * src/nano.c (main) - Add two conditions on ENABLE_NANORC. + * src/files.c (close_buffer, do_insertfile) - Likewise. + This avoids compilation failure when nano is configured + with both --disable-color and --disable-nanorc. + 2014-02-22 Felipe Bugno (tiny change) * doc/nanorc.sample.in - Add an include for CMake files. diff --git a/src/files.c b/src/files.c index 156e8d57..da5e18b9 100644 --- a/src/files.c +++ b/src/files.c @@ -482,9 +482,9 @@ bool close_buffer(void) if (openfile == openfile->next) return FALSE; -#ifndef NANO_TINY +#if !defined(NANO_TINY) && defined(ENABLE_NANORC) update_poshistory(openfile->filename, openfile->current->lineno, xplustabs()+1); -#endif /* NANO_TINY */ +#endif /* Switch to the next file buffer. */ switch_to_next_buffer_void(); @@ -1194,7 +1194,7 @@ void do_insertfile( } #endif -#ifdef ENABLE_MULTIBUFFER +#if defined(ENABLE_MULTIBUFFER) && defined(ENABLE_NANORC) if (ISSET(MULTIBUFFER)) { /* Update the screen to account for the current * buffer. */ diff --git a/src/nano.c b/src/nano.c index d31b2946..a2b5d5d4 100644 --- a/src/nano.c +++ b/src/nano.c @@ -2653,7 +2653,7 @@ int main(int argc, char **argv) iline = 1; icol = 1; } -#ifndef NANO_TINY +#if !defined(NANO_TINY) && defined(ENABLE_NANORC) else { /* See if we have a POS history to use if we haven't overridden it */ ssize_t savedposline, savedposcol; @@ -2661,7 +2661,7 @@ int main(int argc, char **argv) do_gotolinecolumn(savedposline, savedposcol, FALSE, FALSE, FALSE, FALSE); } -#endif /* NANO_TINY */ +#endif } } } @@ -2699,14 +2699,14 @@ int main(int argc, char **argv) if (startline > 1 || startcol > 1) do_gotolinecolumn(startline, startcol, FALSE, FALSE, FALSE, FALSE); -# ifndef NANO_TINY +#if !defined(NANO_TINY) && defined(ENABLE_NANORC) else { /* See if we have a POS history to use if we haven't overridden it */ ssize_t savedposline, savedposcol; if (check_poshistory(argv[optind], &savedposline, &savedposcol)) do_gotolinecolumn(savedposline, savedposcol, FALSE, FALSE, FALSE, FALSE); } -#endif /* NANO_TINY */ +#endif display_main_list(); -- 2.39.5