Mercurial > emacs
changeset 107063:8bd26043ea93
from trunk
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Sun, 31 Jan 2010 15:50:30 +0900 |
| parents | fa65fbe23fdb (current diff) bb5cb7ece094 (diff) |
| children | 5e5fc9c53be3 |
| files | src/ChangeLog |
| diffstat | 2 files changed, 15 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Jan 31 15:46:53 2010 +0900 +++ b/src/ChangeLog Sun Jan 31 15:50:30 2010 +0900 @@ -3,6 +3,11 @@ * font.c (font_parse_xlfd): If FONT is a font-entity and pixel size in NAME is invalid, return -1. +2010-01-31 Chong Yidong <cyd@stupidchicken.com> + + * nsterm.m (ns_defined_color): Block input. Suggested by Mike + <deactivated@gmail.com> (Bug#3605). + 2010-01-31 David De La Harpe Golden <david@harpegolden.net> * fileio.c (Frename_file): Correctly rename symlinks to
--- a/src/nsterm.m Sun Jan 31 15:46:53 2010 +0900 +++ b/src/nsterm.m Sun Jan 31 15:50:30 2010 +0900 @@ -1552,19 +1552,19 @@ Return 0 if not found -------------------------------------------------------------------------- */ { - NSColor *temp; - int notFound = ns_get_color (name, &temp); - + NSColor *col; NSTRACE (ns_defined_color); - if (notFound) - return 0; - + BLOCK_INPUT; + if (ns_get_color (name, &col) != 0) /* Color not found */ + { + UNBLOCK_INPUT; + return 0; + } if (makeIndex && alloc) - color_def->pixel = ns_index_color(temp, f); /* [temp retain]; */ - - ns_query_color (temp, color_def, !makeIndex); - + color_def->pixel = ns_index_color (col, f); + ns_query_color (col, color_def, !makeIndex); + UNBLOCK_INPUT; return 1; }