* coding.c (Fdefine_coding_system_internal): Use XCAR/XCDR instead

of Fcar/Fcdr if possible.
* font.c (check_otf_features): Likewise.
* fontset.c (Fnew_fontset): Likewise.
* gnutls.c (Fgnutls_boot): Likewise.
* minibuf.c (read_minibuf): Likewise.
* msdos.c (IT_set_frame_parameters): Likewise.
* xmenu.c (Fx_popup_dialog): Likewise.
* w32menu.c (Fx_popup_dialog): Likewise.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/w32menu.c b/src/w32menu.c
index 8adc6c62814..24dc9d79192 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -164,10 +164,10 @@ otherwise it is "Question". */)
     {
       Lisp_Object tem = XCAR (position);
       if (CONSP (tem))
-        window = Fcar (Fcdr (position));
+        window = Fcar (XCDR (position));
       else
         {
-          tem = Fcar (Fcdr (position));  /* EVENT_START (position) */
+          tem = Fcar (XCDR (position));  /* EVENT_START (position) */
           window = Fcar (tem);       /* POSN_WINDOW (tem) */
         }
     }