commit 898c4c6fbbf16915aa164d3753c166a45a73634c
parent c1bb6485de91eb661b527b0fd849e4ac653411fa
Author: Benno Schulenberg <bensberg@telfort.nl>
Date: Fri, 12 Jan 2018 10:48:13 +0100
startup: move the initialization of colors, so any error gets printed
Suggested-by: Brand Huntsman <alpha@qzx.com>
Diffstat:
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git 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);