/[emacs]/emacs/src/keyboard.c
ViewVC logotype

Diff of /emacs/src/keyboard.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.681.2.8 by miles, Tue Apr 27 14:08:50 2004 UTC revision 1.681.2.9 by miles, Tue Jul 6 09:14:35 2004 UTC
# Line 996  This function is called by the editor in Line 996  This function is called by the editor in
996    int count = SPECPDL_INDEX ();    int count = SPECPDL_INDEX ();
997    Lisp_Object buffer;    Lisp_Object buffer;
998    
999      /* If we enter while input is blocked, don't lock up here.
1000         This may happen through the debugger during redisplay.  */
1001      if (INPUT_BLOCKED_P)
1002        return Qnil;
1003    
1004    command_loop_level++;    command_loop_level++;
1005    update_mode_lines = 1;    update_mode_lines = 1;
1006    
# Line 1294  DEFUN ("top-level", Ftop_level, Stop_lev Line 1299  DEFUN ("top-level", Ftop_level, Stop_lev
1299    if (display_hourglass_p)    if (display_hourglass_p)
1300      cancel_hourglass ();      cancel_hourglass ();
1301  #endif  #endif
1302    
1303      /* Unblock input if we enter with input blocked.  This may happen if
1304         redisplay traps e.g. during tool-bar update with input blocked.  */
1305      while (INPUT_BLOCKED_P)
1306        UNBLOCK_INPUT;
1307    
1308    return Fthrow (Qtop_level, Qnil);    return Fthrow (Qtop_level, Qnil);
1309  }  }
1310    
# Line 3967  kbd_buffer_get_event (kbp, used_mouse_me Line 3978  kbd_buffer_get_event (kbp, used_mouse_me
3978        else if (event->kind == LANGUAGE_CHANGE_EVENT)        else if (event->kind == LANGUAGE_CHANGE_EVENT)
3979          {          {
3980            /* Make an event (language-change (FRAME CHARSET LCID)).  */            /* Make an event (language-change (FRAME CHARSET LCID)).  */
3981            obj = Fcons (event->modifiers, Qnil);            obj = Fcons (event->frame_or_window, Qnil);
           obj = Fcons (event->code, obj);  
           obj = Fcons (event->frame_or_window, obj);  
3982            obj = Fcons (Qlanguage_change, Fcons (obj, Qnil));            obj = Fcons (Qlanguage_change, Fcons (obj, Qnil));
3983            kbd_fetch_ptr = event + 1;            kbd_fetch_ptr = event + 1;
3984          }          }
# Line 11413  mark_kboards () Line 11422  mark_kboards ()
11422        {        {
11423          if (event == kbd_buffer + KBD_BUFFER_SIZE)          if (event == kbd_buffer + KBD_BUFFER_SIZE)
11424            event = kbd_buffer;            event = kbd_buffer;
11425          mark_object (event->x);          if (event->kind != SELECTION_REQUEST_EVENT)
11426          mark_object (event->y);            {
11427                mark_object (event->x);
11428                mark_object (event->y);
11429              }
11430          mark_object (event->frame_or_window);          mark_object (event->frame_or_window);
11431          mark_object (event->arg);          mark_object (event->arg);
11432        }        }

Legend:
Removed from v.1.681.2.8  
changed lines
  Added in v.1.681.2.9

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26