[Emacs-diffs] trunk r113451: * keyboard.c: Try to fix typos in previous change.

[Paul Eggert]

------------------------------------------------------------
revno: 113451
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2013-07-18 14:16:33 -0700
message:
  * keyboard.c: Try to fix typos in previous change.
  
  (DISPLAY_LIST_INFO): New macro.
  (kbd_buffer_get_event): Do not access members that are not present
  in X11.  Revert nadvertent change of "!=" to "=".
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/keyboard.c                 keyboard.c-20091113204419-o5vbwnq5f7feedwu-449

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-07-18 16:50:05 +0000
+++ b/src/ChangeLog     2013-07-18 21:16:33 +0000
@@ -1,3 +1,10 @@
+2013-07-18  Paul Eggert  <address@hidden>
+
+       * keyboard.c: Try to fix typos in previous change.
+       (DISPLAY_LIST_INFO): New macro.
+       (kbd_buffer_get_event): Do not access members that are not present
+       in X11.  Revert nadvertent change of "!=" to "=".
+
 2013-07-18  Juanma Barranquero  <address@hidden>
 
        * keyboard.c (kbd_buffer_get_event):

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2013-07-18 16:50:05 +0000
+++ b/src/keyboard.c    2013-07-18 21:16:33 +0000
@@ -4066,7 +4066,12 @@
         }
       else if (event->kind == FOCUS_OUT_EVENT)
         {
-#if defined (HAVE_NS) || defined (HAVE_X11) || defined (WINDOWSNT)
+#if defined HAVE_X11 || defined HAVE_NS
+# define DISPLAY_LIST_INFO(di) (di)
+#elif defined WINDOWSNT
+# define DISPLAY_LIST_INFO(di) FRAME_X_DISPLAY_INFO (di)
+#endif
+#ifdef DISPLAY_LIST_INFO
 
 #ifdef HAVE_NS
           struct ns_display_info *di;
@@ -4076,11 +4081,13 @@
           Lisp_Object frame = event->frame_or_window;
           bool focused = false;
 
-          for (di = x_display_list; di && ! focused; di = FRAME_X_DISPLAY_INFO 
(di)->next)
-            focused = FRAME_X_DISPLAY_INFO (di)->x_highlight_frame = 0;
+          for (di = x_display_list;
+              di && ! focused;
+              di = DISPLAY_LIST_INFO (di)->next)
+            focused = DISPLAY_LIST_INFO (di)->x_highlight_frame != 0;
 
           if (! focused) obj = make_lispy_focus_out (frame);
-#endif /* HAVE_NS || HAVE_X11 || WINDOWSNT */
+#endif /* DISPLAY_LIST_INFO */
 
           kbd_fetch_ptr = event + 1;
         }