summaryrefslogtreecommitdiff
path: root/src/coding.c
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2006-06-08 06:48:34 +0000
committerKenichi Handa <handa@m17n.org>2006-06-08 06:48:34 +0000
commit091a0ff08823041bd0f53be1c6124ad108fab9cb (patch)
tree17baa824c04b6d8088e80d152952183f215a5282 /src/coding.c
parentc198294fdd8970e5a87fd278d949e41832a0012c (diff)
downloademacs-091a0ff08823041bd0f53be1c6124ad108fab9cb.tar.gz
emacs-091a0ff08823041bd0f53be1c6124ad108fab9cb.tar.bz2
emacs-091a0ff08823041bd0f53be1c6124ad108fab9cb.zip
(Ffind_operation_coding_system): Sync with HEAD.
Diffstat (limited to 'src/coding.c')
-rw-r--r--src/coding.c4
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))