procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
Andreas Schwab 2012-07-11 09:19:44 +02:00
parent 172bedefc9
commit 34348bd4e5
9 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/ChangeLog
View file

@ -1,3 +1,15 @@
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>
* s/aix4-2.h, s/bsd-common.h, s/cygwin.h, s/darwin.h:

4
src/coding.c
View file

@ -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);

4
src/font.c
View file

@ -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))));

2
src/fontset.c
View file

@ -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))))

8
src/gnutls.c
View file

@ -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: ",

2
src/minibuf.c
View file

@ -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))

4
src/msdos.c
View file

@ -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);

4
src/w32menu.c
View file

@ -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) */
}
}

4
src/xmenu.c
View file

@ -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) */
}
}