Commit 34348bd4 authored by Andreas Schwab's avatar Andreas Schwab
Browse files

* 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.
parent 172bedef
2012-07-11 Andreas Schwab <schwab@linux-m68k.org>
* 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 <rgm@gnu.org> 2012-07-11 Glenn Morris <rgm@gnu.org>
   
* s/aix4-2.h, s/bsd-common.h, s/cygwin.h, s/darwin.h: * s/aix4-2.h, s/bsd-common.h, s/cygwin.h, s/darwin.h:
......
...@@ -9795,7 +9795,7 @@ usage: (define-coding-system-internal ...) */) ...@@ -9795,7 +9795,7 @@ usage: (define-coding-system-internal ...) */)
{ {
int from, to; int from, to;
val = Fcar (tail); val = XCAR (tail);
if (INTEGERP (val)) if (INTEGERP (val))
{ {
if (! (0 <= XINT (val) && XINT (val) <= 255)) if (! (0 <= XINT (val) && XINT (val) <= 255))
...@@ -9897,7 +9897,7 @@ usage: (define-coding-system-internal ...) */) ...@@ -9897,7 +9897,7 @@ usage: (define-coding-system-internal ...) */)
int id; int id;
Lisp_Object tmp1; Lisp_Object tmp1;
val = Fcar (tail); val = XCAR (tail);
CHECK_CONS (val); CHECK_CONS (val);
tmp1 = XCAR (val); tmp1 = XCAR (val);
CHECK_CHARSET_GET_ID (tmp1, id); CHECK_CHARSET_GET_ID (tmp1, id);
......
...@@ -1827,7 +1827,7 @@ check_otf_features (Lisp_Object otf_features) ...@@ -1827,7 +1827,7 @@ check_otf_features (Lisp_Object otf_features)
otf_features = XCDR (otf_features); otf_features = XCDR (otf_features);
for (val = Fcar (otf_features); CONSP (val); val = XCDR (val)) 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) if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4)
error ("Invalid OTF GSUB feature: %s", error ("Invalid OTF GSUB feature: %s",
SDATA (SYMBOL_NAME (XCAR (val)))); SDATA (SYMBOL_NAME (XCAR (val))));
...@@ -1835,7 +1835,7 @@ check_otf_features (Lisp_Object otf_features) ...@@ -1835,7 +1835,7 @@ check_otf_features (Lisp_Object otf_features)
otf_features = XCDR (otf_features); otf_features = XCDR (otf_features);
for (val = Fcar (otf_features); CONSP (val); val = XCDR (val)) 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) if (SBYTES (SYMBOL_NAME (XCAR (val))) > 4)
error ("Invalid OTF GPOS feature: %s", error ("Invalid OTF GPOS feature: %s",
SDATA (SYMBOL_NAME (XCAR (val)))); SDATA (SYMBOL_NAME (XCAR (val))));
......
...@@ -1672,7 +1672,7 @@ FONT-SPEC is a vector, a cons, or a string. See the documentation of ...@@ -1672,7 +1672,7 @@ FONT-SPEC is a vector, a cons, or a string. See the documentation of
{ {
Lisp_Object elt, script; Lisp_Object elt, script;
elt = Fcar (fontlist); elt = XCAR (fontlist);
script = Fcar (elt); script = Fcar (elt);
elt = Fcdr (elt); elt = Fcdr (elt);
if (CONSP (elt) && (NILP (XCDR (elt)) || CONSP (XCDR (elt)))) if (CONSP (elt) && (NILP (XCDR (elt)) || CONSP (XCDR (elt))))
......
...@@ -873,7 +873,7 @@ one trustfile (usually a CA bundle). */) ...@@ -873,7 +873,7 @@ one trustfile (usually a CA bundle). */)
for (tail = trustfiles; CONSP (tail); tail = XCDR (tail)) for (tail = trustfiles; CONSP (tail); tail = XCDR (tail))
{ {
Lisp_Object trustfile = Fcar (tail); Lisp_Object trustfile = XCAR (tail);
if (STRINGP (trustfile)) if (STRINGP (trustfile))
{ {
GNUTLS_LOG2 (1, max_log_level, "setting the trustfile: ", GNUTLS_LOG2 (1, max_log_level, "setting the trustfile: ",
...@@ -895,7 +895,7 @@ one trustfile (usually a CA bundle). */) ...@@ -895,7 +895,7 @@ one trustfile (usually a CA bundle). */)
for (tail = crlfiles; CONSP (tail); tail = XCDR (tail)) for (tail = crlfiles; CONSP (tail); tail = XCDR (tail))
{ {
Lisp_Object crlfile = Fcar (tail); Lisp_Object crlfile = XCAR (tail);
if (STRINGP (crlfile)) if (STRINGP (crlfile))
{ {
GNUTLS_LOG2 (1, max_log_level, "setting the CRL file: ", GNUTLS_LOG2 (1, max_log_level, "setting the CRL file: ",
...@@ -915,8 +915,8 @@ one trustfile (usually a CA bundle). */) ...@@ -915,8 +915,8 @@ one trustfile (usually a CA bundle). */)
for (tail = keylist; CONSP (tail); tail = XCDR (tail)) for (tail = keylist; CONSP (tail); tail = XCDR (tail))
{ {
Lisp_Object keyfile = Fcar (Fcar (tail)); Lisp_Object keyfile = Fcar (XCAR (tail));
Lisp_Object certfile = Fcar (Fcdr (tail)); Lisp_Object certfile = Fcar (XCDR (tail));
if (STRINGP (keyfile) && STRINGP (certfile)) if (STRINGP (keyfile) && STRINGP (certfile))
{ {
GNUTLS_LOG2 (1, max_log_level, "setting the client key file: ", GNUTLS_LOG2 (1, max_log_level, "setting the client key file: ",
......
...@@ -424,7 +424,7 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt, ...@@ -424,7 +424,7 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
{ {
if (CONSP (initial)) if (CONSP (initial))
{ {
Lisp_Object backup_n = Fcdr (initial); Lisp_Object backup_n = XCDR (initial);
initial = XCAR (initial); initial = XCAR (initial);
CHECK_STRING (initial); CHECK_STRING (initial);
if (!NILP (backup_n)) if (!NILP (backup_n))
......
...@@ -1620,9 +1620,7 @@ IT_set_frame_parameters (struct frame *f, Lisp_Object alist) ...@@ -1620,9 +1620,7 @@ IT_set_frame_parameters (struct frame *f, Lisp_Object alist)
i = 0; i = 0;
for (tail = alist; CONSP (tail); tail = XCDR (tail)) for (tail = alist; CONSP (tail); tail = XCDR (tail))
{ {
Lisp_Object elt; Lisp_Object elt = XCAR (tail);
elt = Fcar (tail);
parms[i] = Fcar (elt); parms[i] = Fcar (elt);
CHECK_SYMBOL (parms[i]); CHECK_SYMBOL (parms[i]);
values[i] = Fcdr (elt); values[i] = Fcdr (elt);
......
...@@ -164,10 +164,10 @@ otherwise it is "Question". */) ...@@ -164,10 +164,10 @@ otherwise it is "Question". */)
{ {
Lisp_Object tem = XCAR (position); Lisp_Object tem = XCAR (position);
if (CONSP (tem)) if (CONSP (tem))
window = Fcar (Fcdr (position)); window = Fcar (XCDR (position));
else else
{ {
tem = Fcar (Fcdr (position)); /* EVENT_START (position) */ tem = Fcar (XCDR (position)); /* EVENT_START (position) */
window = Fcar (tem); /* POSN_WINDOW (tem) */ window = Fcar (tem); /* POSN_WINDOW (tem) */
} }
} }
......
...@@ -260,10 +260,10 @@ for instance using the window manager, then this produces a quit and ...@@ -260,10 +260,10 @@ for instance using the window manager, then this produces a quit and
{ {
Lisp_Object tem = XCAR (position); Lisp_Object tem = XCAR (position);
if (CONSP (tem)) if (CONSP (tem))
window = Fcar (Fcdr (position)); window = Fcar (XCDR (position));
else else
{ {
tem = Fcar (Fcdr (position)); /* EVENT_START (position) */ tem = Fcar (XCDR (position)); /* EVENT_START (position) */
window = Fcar (tem); /* POSN_WINDOW (tem) */ window = Fcar (tem); /* POSN_WINDOW (tem) */
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment