mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-11 13:01:28 +02:00
39354: zcurses fix for colour management
Alter internal return code so as not to mask curses error code.
This commit is contained in:
parent
5ee05cf935
commit
7fc0c2d57d
2 changed files with 9 additions and 4 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2016-04-29 Peter Stephenson <p.stephenson@samsung.com>
|
||||||
|
|
||||||
|
* Sebastian: 39354: Src/Modules/curses.c: alter internal return
|
||||||
|
code so as not to mask curses error code.
|
||||||
|
|
||||||
2016-04-26 Barton E. Schaefer <schaefer@zsh.org>
|
2016-04-26 Barton E. Schaefer <schaefer@zsh.org>
|
||||||
|
|
||||||
* 38350 (cf. Glenn Smith: 38348): Src/exec.c: Remove-all warning
|
* 38350 (cf. Glenn Smith: 38348): Src/exec.c: Remove-all warning
|
||||||
|
|
|
@ -324,7 +324,7 @@ zcurses_color(const char *color)
|
||||||
return (short)zc->number;
|
return (short)zc->number;
|
||||||
}
|
}
|
||||||
|
|
||||||
return (short)-1;
|
return (short)-2;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Colorpairnode
|
static Colorpairnode
|
||||||
|
@ -353,10 +353,10 @@ zcurses_colorget(const char *nam, char *colorpair)
|
||||||
f = zcurses_color(cp);
|
f = zcurses_color(cp);
|
||||||
b = zcurses_color(bg+1);
|
b = zcurses_color(bg+1);
|
||||||
|
|
||||||
if (f==-1 || b==-1) {
|
if (f==-2 || b==-2) {
|
||||||
if (f == -1)
|
if (f == -2)
|
||||||
zwarnnam(nam, "foreground color `%s' not known", cp);
|
zwarnnam(nam, "foreground color `%s' not known", cp);
|
||||||
if (b == -1)
|
if (b == -2)
|
||||||
zwarnnam(nam, "background color `%s' not known", bg+1);
|
zwarnnam(nam, "background color `%s' not known", bg+1);
|
||||||
*bg = '/';
|
*bg = '/';
|
||||||
zsfree(cp);
|
zsfree(cp);
|
||||||
|
|
Loading…
Reference in a new issue