From 34348bd4e5c89fa0e440e37efa20be2a00c8fd9c Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 11 Jul 2012 09:19:44 +0200 Subject: [PATCH] * 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. --- src/ChangeLog | 12 ++++++++++++ src/coding.c | 4 ++-- src/font.c | 4 ++-- src/fontset.c | 2 +- src/gnutls.c | 8 ++++---- src/minibuf.c | 2 +- src/msdos.c | 4 +--- src/w32menu.c | 4 ++-- src/xmenu.c | 4 ++-- 9 files changed, 27 insertions(+), 17 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c9e4cbbabc0..0ca6c0594a8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,15 @@ +2012-07-11 Andreas Schwab + + * 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. + 2012-07-11 Glenn Morris * s/aix4-2.h, s/bsd-common.h, s/cygwin.h, s/darwin.h: diff --git a/src/coding.c b/src/coding.c index 134ebf2ab73..d9fcc634b77 100644 --- a/src/coding.c +++ b/src/coding.c @@ -9795,7 +9795,7 @@ usage: (define-coding-system-internal ...) */) { int from, to; - val = Fcar (tail); + val = XCAR (tail); if (INTEGERP (val)) { if (! (0 <= XINT (val) && XINT (val) <= 255)) @@ -9897,7 +9897,7 @@ usage: (define-coding-system-internal ...) */) int id; Lisp_Object tmp1; - val = Fcar (tail); + val = XCAR (tail); CHECK_CONS (val); tmp1 = XCAR (val); CHECK_CHARSET_GET_ID (tmp1, id); diff --git a/src/font.c b/src/font.c index bbfda984a4d..a57029b4af2 100644 --- a/src/font.c +++ b/src/font.c @@ -1827,7 +1827,7 @@ check_otf_features (Lisp_Object otf_features) otf_features = XCDR (otf_features); for (val = Fcar (otf_features); CONSP (val); val = XCDR (val)) { - CHECK_SYMBOL (Fcar (val)); + CHECK_SYMBOL (XCAR (val)); if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4) error ("Invalid OTF GSUB feature: %s", SDATA (SYMBOL_NAME (XCAR (val)))); @@ -1835,7 +1835,7 @@ check_otf_features (Lisp_Object otf_features) otf_features = XCDR (otf_features); for (val = Fcar (otf_features); CONSP (val); val = XCDR (val)) { - CHECK_SYMBOL (Fcar (val)); + CHECK_SYMBOL (XCAR (val)); if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4) error ("Invalid OTF GPOS feature: %s", SDATA (SYMBOL_NAME (XCAR (val)))); diff --git a/src/fontset.c b/src/fontset.c index 3397502a2fd..f3bf221f249 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1672,7 +1672,7 @@ FONT-SPEC is a vector, a cons, or a string. See the documentation of { Lisp_Object elt, script; - elt = Fcar (fontlist); + elt = XCAR (fontlist); script = Fcar (elt); elt = Fcdr (elt); if (CONSP (elt) && (NILP (XCDR (elt)) || CONSP (XCDR (elt)))) diff --git a/src/gnutls.c b/src/gnutls.c index 21658a1bc82..ad569e98226 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -873,7 +873,7 @@ one trustfile (usually a CA bundle). */) for (tail = trustfiles; CONSP (tail); tail = XCDR (tail)) { - Lisp_Object trustfile = Fcar (tail); + Lisp_Object trustfile = XCAR (tail); if (STRINGP (trustfile)) { GNUTLS_LOG2 (1, max_log_level, "setting the trustfile: ", @@ -895,7 +895,7 @@ one trustfile (usually a CA bundle). */) for (tail = crlfiles; CONSP (tail); tail = XCDR (tail)) { - Lisp_Object crlfile = Fcar (tail); + Lisp_Object crlfile = XCAR (tail); if (STRINGP (crlfile)) { GNUTLS_LOG2 (1, max_log_level, "setting the CRL file: ", @@ -915,8 +915,8 @@ one trustfile (usually a CA bundle). */) for (tail = keylist; CONSP (tail); tail = XCDR (tail)) { - Lisp_Object keyfile = Fcar (Fcar (tail)); - Lisp_Object certfile = Fcar (Fcdr (tail)); + Lisp_Object keyfile = Fcar (XCAR (tail)); + Lisp_Object certfile = Fcar (XCDR (tail)); if (STRINGP (keyfile) && STRINGP (certfile)) { GNUTLS_LOG2 (1, max_log_level, "setting the client key file: ", diff --git a/src/minibuf.c b/src/minibuf.c index 27c776857db..7e47be39bc9 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -424,7 +424,7 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt, { if (CONSP (initial)) { - Lisp_Object backup_n = Fcdr (initial); + Lisp_Object backup_n = XCDR (initial); initial = XCAR (initial); CHECK_STRING (initial); if (!NILP (backup_n)) diff --git a/src/msdos.c b/src/msdos.c index d75277e3866..d6a493a71d3 100644 --- a/src/msdos.c +++ b/src/msdos.c @@ -1620,9 +1620,7 @@ IT_set_frame_parameters (struct frame *f, Lisp_Object alist) i = 0; for (tail = alist; CONSP (tail); tail = XCDR (tail)) { - Lisp_Object elt; - - elt = Fcar (tail); + Lisp_Object elt = XCAR (tail); parms[i] = Fcar (elt); CHECK_SYMBOL (parms[i]); values[i] = Fcdr (elt); 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) */ } } diff --git a/src/xmenu.c b/src/xmenu.c index fb03ab84d82..61e3e3632b0 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -260,10 +260,10 @@ for instance using the window manager, then this produces a quit and { 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) */ } } -- 2.39.2