From 898c4c6fbbf16915aa164d3753c166a45a73634c Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@telfort.nl>
Date: Fri, 12 Jan 2018 10:48:13 +0100
Subject: [PATCH] startup: move the initialization of colors, so any error gets
printed
Suggested-by: Brand Huntsman <alpha@qzx.com>
---
src/nano.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/nano.c b/src/nano.c
index 64e523a8..a21625cf 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -2473,6 +2473,17 @@ int main(int argc, char **argv)
if (initscr() == NULL)
exit(1);
+#ifdef ENABLE_COLOR
+ set_colorpairs();
+#else
+ interface_color_pair[TITLE_BAR] = hilite_attribute;
+ interface_color_pair[LINE_NUMBER] = hilite_attribute;
+ interface_color_pair[SELECTED_TEXT] = hilite_attribute;
+ interface_color_pair[STATUS_BAR] = hilite_attribute;
+ interface_color_pair[KEY_COMBO] = hilite_attribute;
+ interface_color_pair[FUNCTION_TAG] = A_NORMAL;
+#endif
+
/* Set up the terminal state. */
terminal_init();
@@ -2494,17 +2505,6 @@ int main(int argc, char **argv)
mouse_init();
#endif
-#ifdef ENABLE_COLOR
- set_colorpairs();
-#else
- interface_color_pair[TITLE_BAR] = hilite_attribute;
- interface_color_pair[LINE_NUMBER] = hilite_attribute;
- interface_color_pair[SELECTED_TEXT] = hilite_attribute;
- interface_color_pair[STATUS_BAR] = hilite_attribute;
- interface_color_pair[KEY_COMBO] = hilite_attribute;
- interface_color_pair[FUNCTION_TAG] = A_NORMAL;
-#endif
-
/* Ask ncurses for the key codes for Control+Left/Right/Up/Down. */
controlleft = get_keycode("kLFT5", CONTROL_LEFT);
controlright = get_keycode("kRIT5", CONTROL_RIGHT);
--
GitLab