From: Adrian Robert <Adrian.B.Robert@gmail.com>
Date: Fri, 5 Nov 2010 10:35:36 +0000 (+0200)
Subject: * nsterm.m (EmacsView-mouseExited:): Correct error in conditional logic pointed out... 
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~375
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f31ba3f06fafcfaa8d14289737becea912993d62;p=emacs.git

* nsterm.m (EmacsView-mouseExited:): Correct error in conditional logic pointed out by Eli Zaretskii.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index d3b3f4cf765..f2768dcc310 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/nsterm.m b/src/nsterm.m
index 2fd82a0cf9b..bdca33efed5 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5313,7 +5313,7 @@ ns_term_shutdown (int sig)
 
   NSTRACE (mouseExited);
 
-  if (dpyinfo || !emacsframe)
+  if (!dpyinfo)
     return;
 
   last_mouse_movement_time = EV_TIMESTAMP (theEvent);