(Ffind_operation_coding_system): Sync with HEAD.

1 files changed, 4 insertions, 0 deletions

diff --git a/src/coding.c b/src/coding.c
index 9f95c2c6777..023dc95c35e 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -8353,8 +8353,12 @@ usage: (find-operation-coding-system OPERATION ARGUMENTS ...)  */)
            SDATA (SYMBOL_NAME (operation)));
   target = args[XINT (target_idx) + 1];
   if (!(STRINGP (target)
+        || (EQ (operation, Qinsert_file_contents) && CONSP (target)
+            && STRINGP (XCAR (target)) && BUFFERP (XCDR (target)))
         || (EQ (operation, Qopen_network_stream) && INTEGERP (target))))
     error ("Invalid %dth argument", XINT (target_idx) + 1);
+  if (CONSP (target))
+    target = XCAR (target);
 
   chain = ((EQ (operation, Qinsert_file_contents)
             || EQ (operation, Qwrite_region))