diff options
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index ae27920b181..3d128612028 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -7571,10 +7571,10 @@ menu_bar_items (Lisp_Object old) | |||
| 7571 | menu_bar_items_vector = | 7571 | menu_bar_items_vector = |
| 7572 | larger_vector (menu_bar_items_vector, 4, -1); | 7572 | larger_vector (menu_bar_items_vector, 4, -1); |
| 7573 | /* Add this item. */ | 7573 | /* Add this item. */ |
| 7574 | ASET (menu_bar_items_vector, i, Qnil), i++; | 7574 | ASET (menu_bar_items_vector, i, Qnil); i++; |
| 7575 | ASET (menu_bar_items_vector, i, Qnil), i++; | 7575 | ASET (menu_bar_items_vector, i, Qnil); i++; |
| 7576 | ASET (menu_bar_items_vector, i, Qnil), i++; | 7576 | ASET (menu_bar_items_vector, i, Qnil); i++; |
| 7577 | ASET (menu_bar_items_vector, i, Qnil), i++; | 7577 | ASET (menu_bar_items_vector, i, Qnil); i++; |
| 7578 | menu_bar_items_index = i; | 7578 | menu_bar_items_index = i; |
| 7579 | } | 7579 | } |
| 7580 | 7580 | ||
| @@ -7642,11 +7642,11 @@ menu_bar_item (Lisp_Object key, Lisp_Object item, Lisp_Object dummy1, void *dumm | |||
| 7642 | if (i + 4 > ASIZE (menu_bar_items_vector)) | 7642 | if (i + 4 > ASIZE (menu_bar_items_vector)) |
| 7643 | menu_bar_items_vector = larger_vector (menu_bar_items_vector, 4, -1); | 7643 | menu_bar_items_vector = larger_vector (menu_bar_items_vector, 4, -1); |
| 7644 | /* Add this item. */ | 7644 | /* Add this item. */ |
| 7645 | ASET (menu_bar_items_vector, i, key), i++; | 7645 | ASET (menu_bar_items_vector, i, key); i++; |
| 7646 | ASET (menu_bar_items_vector, i, | 7646 | ASET (menu_bar_items_vector, i, |
| 7647 | AREF (item_properties, ITEM_PROPERTY_NAME)), i++; | 7647 | AREF (item_properties, ITEM_PROPERTY_NAME)); i++; |
| 7648 | ASET (menu_bar_items_vector, i, Fcons (item, Qnil)), i++; | 7648 | ASET (menu_bar_items_vector, i, Fcons (item, Qnil)); i++; |
| 7649 | ASET (menu_bar_items_vector, i, make_number (0)), i++; | 7649 | ASET (menu_bar_items_vector, i, make_number (0)); i++; |
| 7650 | menu_bar_items_index = i; | 7650 | menu_bar_items_index = i; |
| 7651 | } | 7651 | } |
| 7652 | /* We did find an item for this KEY. Add ITEM to its list of maps. */ | 7652 | /* We did find an item for this KEY. Add ITEM to its list of maps. */ |
| @@ -9447,7 +9447,8 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt, | |||
| 9447 | && current_buffer != starting_buffer) | 9447 | && current_buffer != starting_buffer) |
| 9448 | { | 9448 | { |
| 9449 | GROW_RAW_KEYBUF; | 9449 | GROW_RAW_KEYBUF; |
| 9450 | ASET (raw_keybuf, raw_keybuf_count, key), raw_keybuf_count++; | 9450 | ASET (raw_keybuf, raw_keybuf_count, key); |
| 9451 | raw_keybuf_count++; | ||
| 9451 | keybuf[t++] = key; | 9452 | keybuf[t++] = key; |
| 9452 | mock_input = t; | 9453 | mock_input = t; |
| 9453 | Vquit_flag = Qnil; | 9454 | Vquit_flag = Qnil; |
| @@ -9525,7 +9526,8 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt, | |||
| 9525 | && BUFFERP (XWINDOW (window)->buffer) | 9526 | && BUFFERP (XWINDOW (window)->buffer) |
| 9526 | && XBUFFER (XWINDOW (window)->buffer) != current_buffer) | 9527 | && XBUFFER (XWINDOW (window)->buffer) != current_buffer) |
| 9527 | { | 9528 | { |
| 9528 | ASET (raw_keybuf, raw_keybuf_count, key), raw_keybuf_count++; | 9529 | ASET (raw_keybuf, raw_keybuf_count, key); |
| 9530 | raw_keybuf_count++; | ||
| 9529 | keybuf[t] = key; | 9531 | keybuf[t] = key; |
| 9530 | mock_input = t + 1; | 9532 | mock_input = t + 1; |
| 9531 | 9533 | ||