(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.

diff --git a/src/coding.c b/src/coding.c
index 2b46877055d56696d1bfc653394143d453bee9fb..9487261b78da2a1e1f1693d2884111e4a5b1a246 100644 (file)
--- a/src/coding.c
+++ b/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;
        }
     }