rcfile: do not allow color name "normal" to have a prefix
Because "lightnormal" sounds strange, and can have unexpected effects. This fixes https://savannah.gnu.org/bugs/?60668. Bug existed since version 2.9.5, since the name "normal" was introduced.
Этот коммит содержится в:
родитель
4f9d55bb15
Коммит
e044284998
@ -1025,7 +1025,7 @@ short color_to_short(const char *colorname, bool *vivid, bool *thick)
|
|||||||
|
|
||||||
for (int index = 0; index < COLORCOUNT; index++)
|
for (int index = 0; index < COLORCOUNT; index++)
|
||||||
if (strcmp(colorname, hues[index]) == 0) {
|
if (strcmp(colorname, hues[index]) == 0) {
|
||||||
if (index > 8 && *vivid) {
|
if (index > 7 && *vivid) {
|
||||||
jot_error(N_("Color '%s' takes no prefix"), colorname);
|
jot_error(N_("Color '%s' takes no prefix"), colorname);
|
||||||
return BAD_COLOR;
|
return BAD_COLOR;
|
||||||
} else if (index > 8 && COLORS < 255)
|
} else if (index > 8 && COLORS < 255)
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user