diff options
author | Oliver Kiddle <opk@zsh.org> | 2021-04-02 22:41:07 +0200 |
---|---|---|
committer | Oliver Kiddle <opk@zsh.org> | 2021-04-03 00:58:45 +0200 |
commit | 0721060f3616deac84f82c4a97d75987e276fe0a (patch) | |
tree | 668cfd5065bd93d14e1cbe56dfbf210c926e79d3 /Src/zsh.h | |
parent | 714864a87b11b080da92dee7abc29b8bc64107a5 (diff) | |
download | zsh-0721060f3616deac84f82c4a97d75987e276fe0a.tar.gz zsh-0721060f3616deac84f82c4a97d75987e276fe0a.tar.xz zsh-0721060f3616deac84f82c4a97d75987e276fe0a.zip |
47510: drop code that avoided termcap for named colours
The inconsistency caused test failures where TERM is e.g. rxvt-unicode. This also makes a couple of bits available in zattr by removing flags indicating whether to use termcap which is not an attribute as such.
Diffstat (limited to 'Src/zsh.h')
-rw-r--r-- | Src/zsh.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Src/zsh.h b/Src/zsh.h index 6cf1b4186..a26b2d05b 100644 --- a/Src/zsh.h +++ b/Src/zsh.h @@ -2726,11 +2726,6 @@ struct ttyinfo { /* Bits to shift the background colour */ #define TXT_ATTR_BG_COL_SHIFT (40) -/* Flag to use termcap AF sequence to set colour, if available */ -#define TXT_ATTR_FG_TERMCAP 0x1000 -/* Flag to use termcap AB sequence to set colour, if available */ -#define TXT_ATTR_BG_TERMCAP 0x2000 - /* Flag to indicate that foreground is a 24-bit colour */ #define TXT_ATTR_FG_24BIT 0x4000 /* Flag to indicate that background is a 24-bit colour */ @@ -2739,16 +2734,15 @@ struct ttyinfo { /* Things to turn on, including values for the colour elements */ #define TXT_ATTR_ON_VALUES_MASK \ (TXT_ATTR_ON_MASK|TXT_ATTR_FG_COL_MASK|TXT_ATTR_BG_COL_MASK|\ - TXT_ATTR_FG_TERMCAP|TXT_ATTR_BG_TERMCAP|\ TXT_ATTR_FG_24BIT|TXT_ATTR_BG_24BIT) /* Mask out everything to do with setting a foreground colour */ #define TXT_ATTR_FG_ON_MASK \ - (TXTFGCOLOUR|TXT_ATTR_FG_COL_MASK|TXT_ATTR_FG_TERMCAP|TXT_ATTR_FG_24BIT) + (TXTFGCOLOUR|TXT_ATTR_FG_COL_MASK|TXT_ATTR_FG_24BIT) /* Mask out everything to do with setting a background colour */ #define TXT_ATTR_BG_ON_MASK \ - (TXTBGCOLOUR|TXT_ATTR_BG_COL_MASK|TXT_ATTR_BG_TERMCAP|TXT_ATTR_BG_24BIT) + (TXTBGCOLOUR|TXT_ATTR_BG_COL_MASK|TXT_ATTR_BG_24BIT) /* Mask out everything to do with activating colours */ #define TXT_ATTR_COLOUR_ON_MASK \ |