# HG changeset patch
# User Adrian Robert <Adrian.B.Robert@gmail.com>
# Date 1288953336 -7200
# Node ID 9a159fc42f114d80d39eefdb2d6c0400a6f1dadd
# Parent  672ffe8805607914b2977ccd05f43de6d7b4e41c
* nsterm.m (EmacsView-mouseExited:): Correct error in conditional logic pointed out by Eli Zaretskii.

diff -r 672ffe880560 -r 9a159fc42f11 src/ChangeLog
--- a/src/ChangeLog	Fri Nov 05 01:16:55 2010 -0700
+++ b/src/ChangeLog	Fri Nov 05 12:35:36 2010 +0200
@@ -1,15 +1,26 @@
+2010-11-05  Adrian Robert  <Adrian.B.Robert@gmail.com>
+
+	* nsterm.m (EmacsView-mouseExited:): Correct error in conditional
+	logic pointed out by Eli Zaretskii.
+
 2010-11-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* coding.c (coding-category-list): Refer to set-coding-system-priority
 	instead of the obsolete set-coding-priority in the doc string.
 
+
 2010-11-04  Adrian Robert  <Adrian.B.Robert@gmail.com>
-	    Ismail Donmez  <ismail@namtrac.org>  (tiny change)
+
+	* nsfont.m (nsfont_draw):  Correct previous patch to return
+	correct value.
+	* nsimage.m (EmacsImage-setXBMColor:): Correct previous patch:
+	don't change the method signature, change the return.
+
+2010-11-04  Ismail Donmez  <ismail@namtrac.org>  (tiny change)
 
 	* nsfont.m (nsfont_draw)
 	* nsimage.m (EmacsImage-setXBMColor:)
-	* nsterm.m (EmacsView-performDragOperation:): Correct empty return
-	statements.
+	* nsterm.m (EmacsView-performDragOperation:): Correct empty return.
 
 2010-11-03  Julien Danjou  <julien@danjou.info>
 
diff -r 672ffe880560 -r 9a159fc42f11 src/nsterm.m
--- a/src/nsterm.m	Fri Nov 05 01:16:55 2010 -0700
+++ b/src/nsterm.m	Fri Nov 05 12:35:36 2010 +0200
@@ -5313,7 +5313,7 @@
 
   NSTRACE (mouseExited);
 
-  if (dpyinfo || !emacsframe)
+  if (!dpyinfo)
     return;
 
   last_mouse_movement_time = EV_TIMESTAMP (theEvent);