From 4ed4b9757231f30cd8cfc8ef1c2201d937023d4f Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 11 Feb 2008 11:31:13 +0000 Subject: [PATCH] (read_key_sequence): Don't pass args with side effects to AREF, it fails when compiling with -DENABLE_CHECKING. --- src/ChangeLog | 18 +++++++++++------- src/keyboard.c | 5 +++-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 04babe01a13..9b488a5c1d0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,14 @@ +2008-02-11 Juanma Barranquero + + * 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 - * 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 81e2feadbd8..78298b96681 100644 --- 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) -- 2.39.5