[Emacs-diffs] /srv/bzr/emacs/trunk r102256: * nsterm.m (EmacsView-mouseExited:): Correct error in conditional logic pointed out by Eli Zaretskii.

[Adrian Robert]

------------------------------------------------------------
revno: 102256
committer: Adrian Robert <address@hidden>
branch nick: trunk
timestamp: Fri 2010-11-05 12:35:36 +0200
message:
  * nsterm.m (EmacsView-mouseExited:): Correct error in conditional logic 
pointed out by Eli Zaretskii.
modified:
  src/ChangeLog
  src/nsterm.m

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-11-05 00:01:59 +0000
+++ b/src/ChangeLog     2010-11-05 10:35:36 +0000
@@ -1,15 +1,26 @@
+2010-11-05  Adrian Robert  <address@hidden>
+
+       * nsterm.m (EmacsView-mouseExited:): Correct error in conditional
+       logic pointed out by Eli Zaretskii.
+
 2010-11-04  Lars Magne Ingebrigtsen  <address@hidden>
 
        * 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  <address@hidden>
-           Ismail Donmez  <address@hidden>  (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  <address@hidden>  (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  <address@hidden>
 

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2010-11-04 18:10:50 +0000
+++ b/src/nsterm.m      2010-11-05 10:35:36 +0000
@@ -5313,7 +5313,7 @@
 
   NSTRACE (mouseExited);
 
-  if (dpyinfo || !emacsframe)
+  if (!dpyinfo)
     return;
 
   last_mouse_movement_time = EV_TIMESTAMP (theEvent);