[Emacs-diffs] /srv/bzr/emacs/trunk r108734: * keyboard.c (menu_bar_items, menu_bar_item, read_key_sequence):

[Andreas Schwab]

------------------------------------------------------------
revno: 108734
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Mon 2012-06-25 12:28:47 +0200
message:
  * 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.
modified:
  src/ChangeLog
  src/keyboard.c
  src/menu.c
  src/msdos.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-25 10:16:11 +0000
+++ b/src/ChangeLog     2012-06-25 10:28:47 +0000
@@ -1,3 +1,11 @@
+2012-06-25  Andreas Schwab  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xfns.c (xic_create_fontsetname): Remove redundant calls

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2012-06-24 17:39:14 +0000
+++ b/src/keyboard.c    2012-06-25 10:28:47 +0000
@@ -7571,10 +7571,10 @@
       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 @@
       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 @@
              && 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 @@
                      && 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;
 

=== modified file 'src/menu.c'
--- a/src/menu.c        2012-06-19 16:56:28 +0000
+++ b/src/menu.c        2012-06-25 10:28:47 +0000
@@ -197,7 +197,8 @@
 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 @@
 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 @@
 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 @@
   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

=== modified file 'src/msdos.c'
--- a/src/msdos.c       2012-06-22 21:17:42 +0000
+++ b/src/msdos.c       2012-06-25 10:28:47 +0000
@@ -2466,10 +2466,12 @@
       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;