diff options
| author | Joakim Verona | 2011-11-22 15:39:42 +0100 |
|---|---|---|
| committer | Joakim Verona | 2011-11-22 15:39:42 +0100 |
| commit | 40bb789236e486a3f36eefb2840c293369ce2af3 (patch) | |
| tree | 8e81d3aa5f232ec7f2c5187c683cb0998d2dc4e2 /src/keyboard.c | |
| parent | 62318aed495a48e24ff73fe79e420dd801df3189 (diff) | |
| parent | a8e1496d750ab0f571b3412ff61aaa4da640a036 (diff) | |
| download | emacs-40bb789236e486a3f36eefb2840c293369ce2af3.tar.gz emacs-40bb789236e486a3f36eefb2840c293369ce2af3.zip | |
upstream
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index a9350fc32f3..8b94ee6b5d1 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -935,7 +935,7 @@ pop_kboard (void) | |||
| 935 | state later. | 935 | state later. |
| 936 | 936 | ||
| 937 | If Emacs is already in single_kboard mode, and F's keyboard is | 937 | If Emacs is already in single_kboard mode, and F's keyboard is |
| 938 | locked, then this function will throw an errow. */ | 938 | locked, then this function will throw an error. */ |
| 939 | 939 | ||
| 940 | void | 940 | void |
| 941 | temporarily_switch_to_single_kboard (struct frame *f) | 941 | temporarily_switch_to_single_kboard (struct frame *f) |
| @@ -1063,7 +1063,7 @@ cmd_error_internal (Lisp_Object data, const char *context) | |||
| 1063 | struct frame *sf = SELECTED_FRAME (); | 1063 | struct frame *sf = SELECTED_FRAME (); |
| 1064 | 1064 | ||
| 1065 | /* The immediate context is not interesting for Quits, | 1065 | /* The immediate context is not interesting for Quits, |
| 1066 | since they are asyncronous. */ | 1066 | since they are asynchronous. */ |
| 1067 | if (EQ (XCAR (data), Qquit)) | 1067 | if (EQ (XCAR (data), Qquit)) |
| 1068 | Vsignaling_function = Qnil; | 1068 | Vsignaling_function = Qnil; |
| 1069 | 1069 | ||
| @@ -5403,7 +5403,7 @@ make_lispy_event (struct input_event *event) | |||
| 5403 | || !lispy_function_keys[event->code - FUNCTION_KEY_OFFSET]) | 5403 | || !lispy_function_keys[event->code - FUNCTION_KEY_OFFSET]) |
| 5404 | { | 5404 | { |
| 5405 | /* We need to use an alist rather than a vector as the cache | 5405 | /* We need to use an alist rather than a vector as the cache |
| 5406 | since we can't make a vector long enuf. */ | 5406 | since we can't make a vector long enough. */ |
| 5407 | if (NILP (KVAR (current_kboard, system_key_syms))) | 5407 | if (NILP (KVAR (current_kboard, system_key_syms))) |
| 5408 | KVAR (current_kboard, system_key_syms) = Fcons (Qnil, Qnil); | 5408 | KVAR (current_kboard, system_key_syms) = Fcons (Qnil, Qnil); |
| 5409 | return modify_event_symbol (event->code, | 5409 | return modify_event_symbol (event->code, |
| @@ -8149,7 +8149,7 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item) | |||
| 8149 | Lisp_Object caption; | 8149 | Lisp_Object caption; |
| 8150 | int i, have_label = 0; | 8150 | int i, have_label = 0; |
| 8151 | 8151 | ||
| 8152 | /* Defininition looks like `(menu-item CAPTION BINDING PROPS...)'. | 8152 | /* Definition looks like `(menu-item CAPTION BINDING PROPS...)'. |
| 8153 | Rule out items that aren't lists, don't start with | 8153 | Rule out items that aren't lists, don't start with |
| 8154 | `menu-item' or whose rest following `tool-bar-item' is not a | 8154 | `menu-item' or whose rest following `tool-bar-item' is not a |
| 8155 | list. */ | 8155 | list. */ |
| @@ -8798,7 +8798,7 @@ typedef struct keyremap | |||
| 8798 | /* Positions [START, END) in the key sequence buffer | 8798 | /* Positions [START, END) in the key sequence buffer |
| 8799 | are the key that we have scanned so far. | 8799 | are the key that we have scanned so far. |
| 8800 | Those events are the ones that we will replace | 8800 | Those events are the ones that we will replace |
| 8801 | if PAREHT maps them into a key sequence. */ | 8801 | if PARENT maps them into a key sequence. */ |
| 8802 | int start, end; | 8802 | int start, end; |
| 8803 | } keyremap; | 8803 | } keyremap; |
| 8804 | 8804 | ||