(read_key_sequence): Don't pass args with side effects to AREF,

it fails when compiling with -DENABLE_CHECKING.

diff --git a/src/ChangeLog b/src/ChangeLog
index 04babe01a13646c95a5b2eddfb8a68c75690f104..9b488a5c1d0c4f7a35727e8ff526af7b94d5f759 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,14 @@
+2008-02-11  Juanma Barranquero  <lekktu@gmail.com>
+
+       * w32menu.c (push_submenu_start, push_submenu_end)
+       (push_left_right_boundary, push_menu_pane, push_menu_item):
+       * keyboard.c (read_key_sequence): Don't pass args with side effects
+       to AREF, it fails when compiling with -DENABLE_CHECKING.
+
 2008-02-11  Kenichi Handa  <handa@ni.aist.go.jp>
 
-       * Makefile.in (${lispsource}international/charprop.el): Delete
-       this target.
+       * Makefile.in (${lispsource}international/charprop.el):
+       Delete this target.
 
        * search.c (boyer_moore): Fix incorrect synching of the trunk and
        emacs-unicode-2.
@@ -75,13 +82,10 @@
 
        * s/gnu-linux.h: Remove commented out code.
 
-       * unexec.c: Remove references to obsolete variable
-       COFF_ENCAPSULATE.
+       * unexec.c: Remove references to obsolete variable COFF_ENCAPSULATE.
 
        * Makefile.in: Update what RMS says about using autoconf.
-       (C_COMPILER):
-       (COFF_ENCAPSULATE):
-       (MAKE_PARALLEL): Remove obsolete variable.
+       (C_COMPILER, COFF_ENCAPSULATE, MAKE_PARALLEL): Remove obsolete variable.
        (C_SWITCH_MACHINE_1, C_SWITCH_SYSTEM_1, C_SWITCH_SITE_1):
        (C_SWITCH_X_SITE_1, C_SWITCH_X_MACHINE_1)
        (C_SWITCH_X_SYSTEM_1): Move invariant code outside conditional.

diff --git a/src/keyboard.c b/src/keyboard.c
index 81e2feadbd8680fda669dcd9271ca446844e7390..78298b96681534063f547edb8dd632e571372ee3 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -9590,7 +9590,8 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
            }
 
          GROW_RAW_KEYBUF;
-         ASET (raw_keybuf, raw_keybuf_count++, key);
+         ASET (raw_keybuf, raw_keybuf_count, key);
+         raw_keybuf_count++;
        }
 
       /* Clicks in non-text areas get prefixed by the symbol
@@ -9617,7 +9618,7 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
            {
              Lisp_Object window, posn;
 
-             window = POSN_WINDOW      (EVENT_START (key));
+             window = POSN_WINDOW (EVENT_START (key));
              posn   = POSN_POSN (EVENT_START (key));
 
              if (CONSP (posn)