From 53e865b65434fa9ec12afc11a076aec244cd3c43 Mon Sep 17 00:00:00 2001 From: Kurtis Rader Date: Wed, 1 Jun 2016 20:03:50 -0700 Subject: put curses/terminfo vars into the environment We need to actually export the curses/terminfo env vars in order for `setupterm()` to be able to use them. While fixing this I reworked the fallback logic implemented by @zanchey in response to issue #1060 in order to simplify the logic and clarify the error messages. This does not allow someone to change the curses/terminfo env vars after the first prompt is displayed (you can but it won't affect the current fish process). It only makes it possible to set `TERM`, `TERMINFO`, and `TERMINFO_DIRS` in *config.fish* or similar config file and have them be honored by fish. --- src/output.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/output.h') diff --git a/src/output.h b/src/output.h index 5882676d..2ecebfbf 100644 --- a/src/output.h +++ b/src/output.h @@ -76,12 +76,6 @@ void output_set_writer(int (*writer)(char)); /// Return the current output writer. int (*output_get_writer())(char); -/// Set the terminal name. -void output_set_term(const wcstring &term); - -/// Return the terminal name. -const wchar_t *output_get_term(); - /// Sets what colors are supported. enum { color_support_term256 = 1 << 0, color_support_term24bit = 1 << 1 }; typedef unsigned int color_support_t; -- cgit v1.2.3