Mercurial > vim
comparison src/term.c @ 20524:bed30e6b5a09 v8.2.0816
patch 8.2.0816: terminal test fails when compiled with Athena
Commit: https://github.com/vim/vim/commit/87202264f8e27f084c0e58f98aeb27fa5c6d5251
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun May 24 17:23:45 2020 +0200
patch 8.2.0816: terminal test fails when compiled with Athena
Problem: Terminal test fails when compiled with Athena.
Solution: Do give an error when the GUI is not running. (hint by Dominique
Pelle, closes #5928, closes #6132)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 24 May 2020 17:30:03 +0200 |
parents | 03826c672315 |
children | ecaceb5c5644 |
comparison
equal
deleted
inserted
replaced
20523:775e169d4cfc | 20524:bed30e6b5a09 |
---|---|
1379 if (*name == NUL) | 1379 if (*name == NUL) |
1380 return INVALCOLOR; | 1380 return INVALCOLOR; |
1381 t = termgui_mch_get_color(name); | 1381 t = termgui_mch_get_color(name); |
1382 | 1382 |
1383 if (t == INVALCOLOR) | 1383 if (t == INVALCOLOR) |
1384 semsg(_("E254: Cannot allocate color %s"), name); | 1384 semsg(_(e_alloc_color), name); |
1385 return t; | 1385 return t; |
1386 } | 1386 } |
1387 | 1387 |
1388 guicolor_T | 1388 guicolor_T |
1389 termgui_mch_get_rgb(guicolor_T color) | 1389 termgui_mch_get_rgb(guicolor_T color) |
1585 { | 1585 { |
1586 int r = redraw_asap(CLEAR); | 1586 int r = redraw_asap(CLEAR); |
1587 | 1587 |
1588 log_tr("Received t_Co, redraw_asap(): %d", r); | 1588 log_tr("Received t_Co, redraw_asap(): %d", r); |
1589 } | 1589 } |
1590 #else | 1590 # else |
1591 redraw_asap(CLEAR); | 1591 redraw_asap(CLEAR); |
1592 #endif | 1592 # endif |
1593 } | 1593 } |
1594 } | 1594 } |
1595 #endif | 1595 #endif |
1596 | 1596 |
1597 #ifdef HAVE_TGETENT | 1597 #ifdef HAVE_TGETENT |
1598 static char *(key_names[]) = | 1598 static char *(key_names[]) = |
1599 { | 1599 { |
1600 #ifdef FEAT_TERMRESPONSE | 1600 # ifdef FEAT_TERMRESPONSE |
1601 // Do this one first, it may cause a screen redraw. | 1601 // Do this one first, it may cause a screen redraw. |
1602 "Co", | 1602 "Co", |
1603 #endif | 1603 # endif |
1604 "ku", "kd", "kr", "kl", | 1604 "ku", "kd", "kr", "kl", |
1605 "#2", "#4", "%i", "*7", | 1605 "#2", "#4", "%i", "*7", |
1606 "k1", "k2", "k3", "k4", "k5", "k6", | 1606 "k1", "k2", "k3", "k4", "k5", "k6", |
1607 "k7", "k8", "k9", "k;", "F1", "F2", | 1607 "k7", "k8", "k9", "k;", "F1", "F2", |
1608 "%1", "&8", "kb", "kI", "kD", "kh", | 1608 "%1", "&8", "kb", "kI", "kD", "kh", |