Mercurial > emacs
comparison src/keyboard.c @ 44135:8f0053476105
Fix typos.
author | Pavel Janík <Pavel@Janik.cz> |
---|---|
date | Sun, 24 Mar 2002 20:29:38 +0000 |
parents | 92101c2bc6bf |
children | 21286349d285 |
comparison
equal
deleted
inserted
replaced
44134:ee7e76098967 | 44135:8f0053476105 |
---|---|
647 #endif | 647 #endif |
648 | 648 |
649 /* After a command is executed, if point is moved into a region that | 649 /* After a command is executed, if point is moved into a region that |
650 has specific properties (e.g. composition, display), we adjust | 650 has specific properties (e.g. composition, display), we adjust |
651 point to the boundary of the region. But, if a command sets this | 651 point to the boundary of the region. But, if a command sets this |
652 valiable to non-nil, we suppress this point adjustment. This | 652 variable to non-nil, we suppress this point adjustment. This |
653 variable is set to nil before reading a command. */ | 653 variable is set to nil before reading a command. */ |
654 | 654 |
655 Lisp_Object Vdisable_point_adjustment; | 655 Lisp_Object Vdisable_point_adjustment; |
656 | 656 |
657 /* If non-nil, always disable point adjustment. */ | 657 /* If non-nil, always disable point adjustment. */ |
1238 } | 1238 } |
1239 | 1239 |
1240 /* Here we catch errors in execution of commands within the | 1240 /* Here we catch errors in execution of commands within the |
1241 editing loop, and reenter the editing loop. | 1241 editing loop, and reenter the editing loop. |
1242 When there is an error, cmd_error runs and returns a non-nil | 1242 When there is an error, cmd_error runs and returns a non-nil |
1243 value to us. A value of nil means that cmd_loop_1 itself | 1243 value to us. A value of nil means that command_loop_1 itself |
1244 returned due to end of file (or end of kbd macro). */ | 1244 returned due to end of file (or end of kbd macro). */ |
1245 | 1245 |
1246 Lisp_Object | 1246 Lisp_Object |
1247 command_loop_2 () | 1247 command_loop_2 () |
1248 { | 1248 { |
2025 | 2025 |
2026 If OBJECT is a string (an overlay string or a string displayed with | 2026 If OBJECT is a string (an overlay string or a string displayed with |
2027 the `display' property). POS is the position in that string under | 2027 the `display' property). POS is the position in that string under |
2028 the mouse. | 2028 the mouse. |
2029 | 2029 |
2030 OK_TO_IVERWRITE_KEYSTROKE_ECHO non-zero means it's okay if the help | 2030 OK_TO_OVERWRITE_KEYSTROKE_ECHO non-zero means it's okay if the help |
2031 echo overwrites a keystroke echo currently displayed in the echo | 2031 echo overwrites a keystroke echo currently displayed in the echo |
2032 area. | 2032 area. |
2033 | 2033 |
2034 Note: this function may only be called with HELP nil or a string | 2034 Note: this function may only be called with HELP nil or a string |
2035 from X code running asynchronously. */ | 2035 from X code running asynchronously. */ |
2322 So, condition (3) means in clear text ok_to_echo_at_next_pause | 2322 So, condition (3) means in clear text ok_to_echo_at_next_pause |
2323 must be either null, or the current message isn't from echoing at | 2323 must be either null, or the current message isn't from echoing at |
2324 all, or it's from echoing from a different kboard than the | 2324 all, or it's from echoing from a different kboard than the |
2325 current one. */ | 2325 current one. */ |
2326 | 2326 |
2327 if (/* There currently something in the echo area */ | 2327 if (/* There currently is something in the echo area. */ |
2328 !NILP (echo_area_buffer[0]) | 2328 !NILP (echo_area_buffer[0]) |
2329 && (/* And it's either not from echoing. */ | 2329 && (/* And it's either not from echoing. */ |
2330 !EQ (echo_area_buffer[0], echo_message_buffer) | 2330 !EQ (echo_area_buffer[0], echo_message_buffer) |
2331 /* Or it's an echo from a different kboard. */ | 2331 /* Or it's an echo from a different kboard. */ |
2332 || echo_kboard != current_kboard | 2332 || echo_kboard != current_kboard |
4756 return modify_event_symbol (event->code, | 4756 return modify_event_symbol (event->code, |
4757 event->modifiers, | 4757 event->modifiers, |
4758 Qfunction_key, | 4758 Qfunction_key, |
4759 current_kboard->Vsystem_key_alist, | 4759 current_kboard->Vsystem_key_alist, |
4760 0, ¤t_kboard->system_key_syms, | 4760 0, ¤t_kboard->system_key_syms, |
4761 (unsigned)-1); | 4761 (unsigned) -1); |
4762 } | 4762 } |
4763 | 4763 |
4764 #ifdef XK_kana_A | 4764 #ifdef XK_kana_A |
4765 if (event->code >= 0x400 && event->code < 0x500) | 4765 if (event->code >= 0x400 && event->code < 0x500) |
4766 return modify_event_symbol (event->code - 0x400, | 4766 return modify_event_symbol (event->code - 0x400, |
5389 #endif | 5389 #endif |
5390 | 5390 |
5391 case TOOL_BAR_EVENT: | 5391 case TOOL_BAR_EVENT: |
5392 if (EQ (event->arg, event->frame_or_window)) | 5392 if (EQ (event->arg, event->frame_or_window)) |
5393 /* This is the prefix key. We translate this to | 5393 /* This is the prefix key. We translate this to |
5394 `(tool_bar)' because the code in keyboard.c for menu | 5394 `(tool_bar)' because the code in keyboard.c for tool bar |
5395 events, which we use, relies on this. */ | 5395 events, which we use, relies on this. */ |
5396 return Fcons (Qtool_bar, Qnil); | 5396 return Fcons (Qtool_bar, Qnil); |
5397 else if (SYMBOLP (event->arg)) | 5397 else if (SYMBOLP (event->arg)) |
5398 return apply_modifiers (event->modifiers, event->arg); | 5398 return apply_modifiers (event->modifiers, event->arg); |
5399 return event->arg; | 5399 return event->arg; |
7090 /*********************************************************************** | 7090 /*********************************************************************** |
7091 Tool-bars | 7091 Tool-bars |
7092 ***********************************************************************/ | 7092 ***********************************************************************/ |
7093 | 7093 |
7094 /* A vector holding tool bar items while they are parsed in function | 7094 /* A vector holding tool bar items while they are parsed in function |
7095 tool_bar_items runs Each item occupies TOOL_BAR_ITEM_NSCLOTS elements | 7095 tool_bar_items. Each item occupies TOOL_BAR_ITEM_NSCLOTS elements |
7096 in the vector. */ | 7096 in the vector. */ |
7097 | 7097 |
7098 static Lisp_Object tool_bar_items_vector; | 7098 static Lisp_Object tool_bar_items_vector; |
7099 | 7099 |
7100 /* A vector holding the result of parse_tool_bar_item. Layout is like | 7100 /* A vector holding the result of parse_tool_bar_item. Layout is like |
7397 } | 7397 } |
7398 else if (EQ (key, QCimage) | 7398 else if (EQ (key, QCimage) |
7399 && (CONSP (value) | 7399 && (CONSP (value) |
7400 || (VECTORP (value) && XVECTOR (value)->size == 4))) | 7400 || (VECTORP (value) && XVECTOR (value)->size == 4))) |
7401 /* Value is either a single image specification or a vector | 7401 /* Value is either a single image specification or a vector |
7402 of 4 such specifications for the different buttion states. */ | 7402 of 4 such specifications for the different button states. */ |
7403 PROP (TOOL_BAR_ITEM_IMAGES) = value; | 7403 PROP (TOOL_BAR_ITEM_IMAGES) = value; |
7404 } | 7404 } |
7405 | 7405 |
7406 /* If got a filter apply it on binding. */ | 7406 /* If got a filter apply it on binding. */ |
7407 if (!NILP (filter)) | 7407 if (!NILP (filter)) |
9547 input_pending = 0; | 9547 input_pending = 0; |
9548 } | 9548 } |
9549 | 9549 |
9550 /* Return nonzero if there are pending requeued events. | 9550 /* Return nonzero if there are pending requeued events. |
9551 This isn't used yet. The hope is to make wait_reading_process_input | 9551 This isn't used yet. The hope is to make wait_reading_process_input |
9552 call it, and return return if it runs Lisp code that unreads something. | 9552 call it, and return if it runs Lisp code that unreads something. |
9553 The problem is, kbd_buffer_get_event needs to be fixed to know what | 9553 The problem is, kbd_buffer_get_event needs to be fixed to know what |
9554 to do in that case. It isn't trivial. */ | 9554 to do in that case. It isn't trivial. */ |
9555 | 9555 |
9556 int | 9556 int |
9557 requeued_events_pending_p () | 9557 requeued_events_pending_p () |
9859 /* Tell interrupt_signal not to throw back to read_char, */ | 9859 /* Tell interrupt_signal not to throw back to read_char, */ |
9860 waiting_for_input = 0; | 9860 waiting_for_input = 0; |
9861 input_available_clear_time = 0; | 9861 input_available_clear_time = 0; |
9862 } | 9862 } |
9863 | 9863 |
9864 /* This routine is called at interrupt level in response to C-G. | 9864 /* This routine is called at interrupt level in response to C-g. |
9865 | 9865 |
9866 If interrupt_input, this is the handler for SIGINT. Otherwise, it | 9866 If interrupt_input, this is the handler for SIGINT. Otherwise, it |
9867 is called from kbd_buffer_store_event, in handling SIGIO or | 9867 is called from kbd_buffer_store_event, in handling SIGIO or |
9868 SIGTINT. | 9868 SIGTINT. |
9869 | 9869 |