[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r113456: Fix the fix for bug #14901.
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] trunk r113456: Fix the fix for bug #14901. |
Date: |
Fri, 19 Jul 2013 10:56:00 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 113456
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14901
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2013-07-19 13:55:36 +0300
message:
Fix the fix for bug #14901.
src/keyboard.c (kbd_buffer_get_event): Use Display_Info instead of
unportable 'struct x_display_info'.
(DISPLAY_LIST_INFO): Delete macro: not needed, since Display_Info
is a portable type.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/keyboard.c keyboard.c-20091113204419-o5vbwnq5f7feedwu-449
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-07-19 05:36:50 +0000
+++ b/src/ChangeLog 2013-07-19 10:55:36 +0000
@@ -1,3 +1,10 @@
+2013-07-19 Eli Zaretskii <address@hidden>
+
+ * keyboard.c (kbd_buffer_get_event): Use Display_Info instead of
+ unportable 'struct x_display_info'.
+ (DISPLAY_LIST_INFO): Delete macro: not needed, since Display_Info
+ is a portable type.
+
2013-07-19 Paul Eggert <address@hidden>
* sysdep.c [GNU_LINUX]: Fix fd and memory leaks and similar issues.
=== modified file 'src/keyboard.c'
--- a/src/keyboard.c 2013-07-18 21:16:33 +0000
+++ b/src/keyboard.c 2013-07-19 10:55:36 +0000
@@ -4066,28 +4066,19 @@
}
else if (event->kind == FOCUS_OUT_EVENT)
{
-#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_WINDOW_SYSTEM
-#ifdef HAVE_NS
- struct ns_display_info *di;
-#else
- struct x_display_info *di;
-#endif
+ Display_Info *di;
Lisp_Object frame = event->frame_or_window;
bool focused = false;
- 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 /* DISPLAY_LIST_INFO */
+ for (di = x_display_list; di && ! focused; di = di->next)
+ focused = di->x_highlight_frame != 0;
+
+ if (!focused)
+ obj = make_lispy_focus_out (frame);
+
+#endif /* HAVE_WINDOW_SYSTEM */
kbd_fetch_ptr = event + 1;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r113456: Fix the fix for bug #14901.,
Eli Zaretskii <=