aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2006-05-29 00:57:27 +0000
committerKenichi Handa2006-05-29 00:57:27 +0000
commit7311509ee6842235502d446a4aaf16d3f0a6e068 (patch)
treefc01faaa218452b8ceb6cb84fce5637726208511 /src
parent0985f920394f5ee6a2fcf39ec1fbd53fbd3510bc (diff)
downloademacs-7311509ee6842235502d446a4aaf16d3f0a6e068.tar.gz
emacs-7311509ee6842235502d446a4aaf16d3f0a6e068.zip
(Ffind_operation_coding_system): Call a function by
safe_call1 instead of call1.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/coding.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index fecf2dd636e..f210ed382a6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12006-05-29 Kenichi Handa <handa@m17n.org>
2
3 * coding.c (Ffind_operation_coding_system): Call a function by
4 safe_call1 instead of call1.
5
12006-05-28 Kim F. Storm <storm@cua.dk> 62006-05-28 Kim F. Storm <storm@cua.dk>
2 7
3 * xdisp.c (set_cursor_from_row): If cursor cannot be set in row, 8 * xdisp.c (set_cursor_from_row): If cursor cannot be set in row,
diff --git a/src/coding.c b/src/coding.c
index 5ef412a3619..03c07c3ba68 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -7539,7 +7539,7 @@ usage: (find-operation-coding-system OPERATION ARGUMENTS ...) */)
7539 return Fcons (val, val); 7539 return Fcons (val, val);
7540 if (! NILP (Ffboundp (val))) 7540 if (! NILP (Ffboundp (val)))
7541 { 7541 {
7542 val = call1 (val, Flist (nargs, args)); 7542 val = safe_call1 (val, Flist (nargs, args));
7543 if (CONSP (val)) 7543 if (CONSP (val))
7544 return val; 7544 return val;
7545 if (SYMBOLP (val) && ! NILP (Fcoding_system_p (val))) 7545 if (SYMBOLP (val) && ! NILP (Fcoding_system_p (val)))