mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-21 05:00:47 -08:00
(Ffind_operation_coding_system): If a function in
XXX-coding-system-alist returns a coding system (instead of cons of coding systems), return cons of it.
This commit is contained in:
parent
05d7062806
commit
b19fd4c592
1 changed files with 10 additions and 2 deletions
12
src/coding.c
12
src/coding.c
|
|
@ -3788,14 +3788,22 @@ which is a list of all the arguments given to this function.")
|
|||
|| (INTEGERP (target) && EQ (target, XCONS (elt)->car))))
|
||||
{
|
||||
val = XCONS (elt)->cdr;
|
||||
/* Here, if VAL is both a valid coding system and a valid
|
||||
function symbol, we return VAL as a coding system. */
|
||||
if (CONSP (val))
|
||||
return val;
|
||||
if (! SYMBOLP (val))
|
||||
return Qnil;
|
||||
if (! NILP (Fcoding_system_p (val)))
|
||||
return Fcons (val, val);
|
||||
if (!NILP (Ffboundp (val)))
|
||||
return call1 (val, Flist (nargs, args));
|
||||
if (! NILP (Ffboundp (val)))
|
||||
{
|
||||
val = call1 (val, Flist (nargs, args));
|
||||
if (CONSP (val))
|
||||
return val;
|
||||
if (SYMBOLP (val) && ! NILP (Fcoding_system_p (val)))
|
||||
return Fcons (val, val);
|
||||
}
|
||||
return Qnil;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue