From 4eac699df3cdaf1b4cb75d4016e815062ebd2a29 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Sat, 3 Dec 2016 20:25:16 +0100
Subject: [PATCH] tweaks: remove some more annoying conditional compilation

---
 src/files.c | 8 ++------
 src/nano.c  | 9 +--------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/files.c b/src/files.c
index b085e9dc..fd2475e4 100644
--- a/src/files.c
+++ b/src/files.c
@@ -422,12 +422,8 @@ void stat_with_alloc(const char *filename, struct stat **pstat)
  * or into a new buffer when MULTIBUFFER is set or there is no buffer yet. */
 bool open_buffer(const char *filename, bool undoable)
 {
-    bool new_buffer = (openfile == NULL
-#ifndef DISABLE_MULTIBUFFER
-			|| ISSET(MULTIBUFFER)
-#endif
-	);
-	/* Whether we load into this buffer or a new one. */
+    bool new_buffer = (openfile == NULL || ISSET(MULTIBUFFER));
+	/* Whether we load into the current buffer or a new one. */
     char *realname;
 	/* The filename after tilde expansion. */
     FILE *f;
diff --git a/src/nano.c b/src/nano.c
index 93ea9c0e..1d771908 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1415,14 +1415,7 @@ void do_toggle(int flag)
 
     enabled = ISSET(flag);
 
-    if (flag == NO_HELP
-#ifndef DISABLE_WRAPPING
-	|| flag == NO_WRAP
-#endif
-#ifndef DISABLE_COLOR
-	|| flag == NO_COLOR_SYNTAX
-#endif
-	)
+    if (flag == NO_HELP || flag == NO_WRAP || flag == NO_COLOR_SYNTAX)
 	enabled = !enabled;
 
     statusline(HUSH, "%s %s", _(flagtostr(flag)),