# HG changeset patch # User YAMAMOTO Mitsuharu # Date 1113301505 0 # Node ID f914c4fa96108a7bade10aa2d9662398c9870433 # Parent af0b365f3c395e573e3a7d180301570263248c91 (Qlanguage_change) [MAC_OS]: New variable. (syms_of_keyboard) [MAC_OS]: Intern and staticpro it. (kbd_buffer_get_event) [MAC_OS]: Make event for LANGUAGE_CHANGE_EVENT. diff -r af0b365f3c39 -r f914c4fa9610 src/keyboard.c --- a/src/keyboard.c Tue Apr 12 09:02:40 2005 +0000 +++ b/src/keyboard.c Tue Apr 12 10:25:05 2005 +0000 @@ -530,7 +530,7 @@ /* Symbols to denote kinds of events. */ Lisp_Object Qfunction_key; Lisp_Object Qmouse_click; -#ifdef WINDOWSNT +#if defined (WINDOWSNT) || defined (MAC_OS) Lisp_Object Qlanguage_change; #endif Lisp_Object Qdrag_n_drop; @@ -4036,11 +4036,16 @@ x_activate_menubar (XFRAME (event->frame_or_window)); } #endif -#ifdef WINDOWSNT +#if defined (WINDOWSNT) || defined (MAC_OS) else if (event->kind == LANGUAGE_CHANGE_EVENT) { +#ifdef MAC_OS + /* Make an event (language-change (KEY_SCRIPT)). */ + obj = Fcons (make_number (event->code), Qnil); +#else /* Make an event (language-change (FRAME CHARSET LCID)). */ obj = Fcons (event->frame_or_window, Qnil); +#endif obj = Fcons (Qlanguage_change, Fcons (obj, Qnil)); kbd_fetch_ptr = event + 1; } @@ -10845,7 +10850,7 @@ staticpro (&Qfunction_key); Qmouse_click = intern ("mouse-click"); staticpro (&Qmouse_click); -#ifdef WINDOWSNT +#if defined (WINDOWSNT) || defined (MAC_OS) Qlanguage_change = intern ("language-change"); staticpro (&Qlanguage_change); #endif