mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-01 08:17:38 +00:00
Code Issues Releases Activity

* keyboard.c (menu_bar_items, menu_bar_item, read_key_sequence):

Browse Source 
Avoid comma operator.
* menu.c (push_submenu_start, push_submenu_end)
(push_left_right_boundary, push_menu_pane): Likewise.
* msdos.c (dos_rawgetc): Likewise.
This commit is contained in:
Andreas Schwab 2012-06-25 12:28:47 +02:00
parent 75d5be5c60
commit fb7da12e75
4 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ChangeLog
View File

@ -1,3 +1,11 @@
2012-06-25 Andreas Schwab <schwab@linux-m68k.org>
* keyboard.c (menu_bar_items, menu_bar_item, read_key_sequence):
Avoid comma operator.
* menu.c (push_submenu_start, push_submenu_end)
(push_left_right_boundary, push_menu_pane): Likewise.
* msdos.c (dos_rawgetc): Likewise.
2012-06-25 Dmitry Antipov <dmantipov@yandex.ru>
* xfns.c (xic_create_fontsetname): Remove redundant calls

22
src/keyboard.c
View File

@ -7571,10 +7571,10 @@ menu_bar_items (Lisp_Object old)
menu_bar_items_vector =
larger_vector (menu_bar_items_vector, 4, -1);
/* Add this item. */
ASET (menu_bar_items_vector, i, Qnil), i++;
ASET (menu_bar_items_vector, i, Qnil), i++;
ASET (menu_bar_items_vector, i, Qnil), i++;
ASET (menu_bar_items_vector, i, Qnil), i++;
ASET (menu_bar_items_vector, i, Qnil); i++;
ASET (menu_bar_items_vector, i, Qnil); i++;
ASET (menu_bar_items_vector, i, Qnil); i++;
ASET (menu_bar_items_vector, i, Qnil); i++;
menu_bar_items_index = i;
}
@ -7642,11 +7642,11 @@ menu_bar_item (Lisp_Object key, Lisp_Object item, Lisp_Object dummy1, void *dumm
if (i + 4 > ASIZE (menu_bar_items_vector))
menu_bar_items_vector = larger_vector (menu_bar_items_vector, 4, -1);
/* Add this item. */
ASET (menu_bar_items_vector, i, key), i++;
ASET (menu_bar_items_vector, i, key); i++;
ASET (menu_bar_items_vector, i,
AREF (item_properties, ITEM_PROPERTY_NAME)), i++;
ASET (menu_bar_items_vector, i, Fcons (item, Qnil)), i++;
ASET (menu_bar_items_vector, i, make_number (0)), i++;
AREF (item_properties, ITEM_PROPERTY_NAME)); i++;
ASET (menu_bar_items_vector, i, Fcons (item, Qnil)); i++;
ASET (menu_bar_items_vector, i, make_number (0)); i++;
menu_bar_items_index = i;
}
/* 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,
&& current_buffer != starting_buffer)
{
GROW_RAW_KEYBUF;
ASET (raw_keybuf, raw_keybuf_count, key), raw_keybuf_count++;
ASET (raw_keybuf, raw_keybuf_count, key);
raw_keybuf_count++;
keybuf[t++] = key;
mock_input = t;
Vquit_flag = Qnil;
@ -9525,7 +9526,8 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
&& BUFFERP (XWINDOW (window)->buffer)
&& XBUFFER (XWINDOW (window)->buffer) != current_buffer)
{
ASET (raw_keybuf, raw_keybuf_count, key), raw_keybuf_count++;
ASET (raw_keybuf, raw_keybuf_count, key);
raw_keybuf_count++;
keybuf[t] = key;
mock_input = t + 1;

18
src/menu.c
View File

@ -197,7 +197,8 @@ static void
push_submenu_start (void)
{
ensure_menu_items (1);
ASET (menu_items, menu_items_used, Qnil), menu_items_used++;
ASET (menu_items, menu_items_used, Qnil);
menu_items_used++;
menu_items_submenu_depth++;
}
@ -207,7 +208,8 @@ static void
push_submenu_end (void)
{
ensure_menu_items (1);
ASET (menu_items, menu_items_used, Qlambda), menu_items_used++;
ASET (menu_items, menu_items_used, Qlambda);
menu_items_used++;
menu_items_submenu_depth--;
}
@ -219,7 +221,8 @@ static void
push_left_right_boundary (void)
{
ensure_menu_items (1);
ASET (menu_items, menu_items_used, Qquote), menu_items_used++;
ASET (menu_items, menu_items_used, Qquote);
menu_items_used++;
}
/* Start a new menu pane in menu_items.
@ -231,9 +234,12 @@ push_menu_pane (Lisp_Object name, Lisp_Object prefix_vec)
ensure_menu_items (MENU_ITEMS_PANE_LENGTH);
if (menu_items_submenu_depth == 0)
menu_items_n_panes++;
ASET (menu_items, menu_items_used, Qt), menu_items_used++;
ASET (menu_items, menu_items_used, name), menu_items_used++;
ASET (menu_items, menu_items_used, prefix_vec), menu_items_used++;
ASET (menu_items, menu_items_used, Qt);
menu_items_used++;
ASET (menu_items, menu_items_used, name);
menu_items_used++;
ASET (menu_items, menu_items_used, prefix_vec);
menu_items_used++;
}
/* Push one menu item into the current pane. NAME is the string to

6
src/msdos.c
View File

@ -2466,10 +2466,12 @@ dos_rawgetc (void)
sc = regs.h.ah;
total_doskeys += 2;
ASET (recent_doskeys, recent_doskeys_index, make_number (c)), recent_doskeys_index++;
ASET (recent_doskeys, recent_doskeys_index, make_number (c));
recent_doskeys_index++;
if (recent_doskeys_index == NUM_RECENT_DOSKEYS)
recent_doskeys_index = 0;
ASET (recent_doskeys, recent_doskeys_index, make_number (sc)), recent_doskeys_index++;
ASET (recent_doskeys, recent_doskeys_index, make_number (sc));
recent_doskeys_index++;
if (recent_doskeys_index == NUM_RECENT_DOSKEYS)
recent_doskeys_index = 0;