[Emacs-diffs] /srv/bzr/emacs/trunk r99426: * nsterm.m (ns_defined_color): Block input. Suggested by Mike

[Chong Yidong]

------------------------------------------------------------
revno: 99426
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2010-01-31 00:23:09 -0500
message:
  * nsterm.m (ns_defined_color): Block input.  Suggested by Mike
  <address@hidden> (Bug#3605).
modified:
  src/ChangeLog
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-01-31 04:49:28 +0000
+++ b/src/ChangeLog     2010-01-31 05:23:09 +0000
@@ -1,3 +1,8 @@
+2010-01-31  Chong Yidong  <address@hidden>
+
+       * nsterm.m (ns_defined_color): Block input.  Suggested by Mike
+       <address@hidden> (Bug#3605).
+
 2010-01-31  David De La Harpe Golden  <address@hidden>
 
        * fileio.c (Frename_file): Correctly rename symlinks to

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2010-01-31 03:36:06 +0000
+++ b/src/nsterm.m      2010-01-31 05:23:09 +0000
@@ -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;
 }