mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-01 09:51:22 -08:00
Code Issues Projects Releases Wiki Activity

* keyboard.c: Try to fix typos in previous change.

Browse source 
(DISPLAY_LIST_INFO): New macro.
(kbd_buffer_get_event): Do not access members that are not present
in X11.  Revert nadvertent change of "!=" to "=".
This commit is contained in:
Paul Eggert 2013-07-18 14:16:33 -07:00
parent 945c5bb194
commit 4d19d19407
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -1,3 +1,10 @@
2013-07-18 Paul Eggert <eggert@cs.ucla.edu>
* 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 <lekktu@gmail.com>
* keyboard.c (kbd_buffer_get_event):

15
src/keyboard.c
View file

@ -4066,7 +4066,12 @@ kbd_buffer_get_event (KBOARD **kbp,
}
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 @@ kbd_buffer_get_event (KBOARD **kbp,
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;
}