procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

from trunk

Browse source
This commit is contained in:
Kenichi Handa 2010-01-31 15:50:30 +09:00
commit a1c65d578c
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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

20
src/nsterm.m
View file

@ -1552,19 +1552,19 @@ Free a pool and temporary objects it refers to (callable from C)
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;
}