diff options
| author | Miles Bader | 2006-08-03 11:45:23 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-08-03 11:45:23 +0000 |
| commit | e2b97060142842813b657144787cef3e6e743967 (patch) | |
| tree | d7f76853b585d08837d3321504a759919c5fbb42 /src/coding.c | |
| parent | a8fa10a629c86144c90b8b0e58f99581c4e82aba (diff) | |
| parent | 9b7fa2975f40b82e94dadd13c049ff67ef0ef449 (diff) | |
| download | emacs-e2b97060142842813b657144787cef3e6e743967.tar.gz emacs-e2b97060142842813b657144787cef3e6e743967.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 357-381)
- Merge from gnus--rel--5.10
- Update from CVS
- Merge from erc--emacs--21
* gnus--rel--5.10 (patch 116-122)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-98
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/coding.c b/src/coding.c index cb6df79fca0..9ba96981c7f 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -8390,7 +8390,10 @@ usage: (find-operation-coding-system OPERATION ARGUMENTS ...) */) | |||
| 8390 | return Fcons (val, val); | 8390 | return Fcons (val, val); |
| 8391 | if (! NILP (Ffboundp (val))) | 8391 | if (! NILP (Ffboundp (val))) |
| 8392 | { | 8392 | { |
| 8393 | val = safe_call1 (val, Flist (nargs, args)); | 8393 | /* We use call1 rather than safe_call1 |
| 8394 | so as to get bug reports about functions called here | ||
| 8395 | which don't handle the current interface. */ | ||
| 8396 | val = call1 (val, Flist (nargs, args)); | ||
| 8394 | if (CONSP (val)) | 8397 | if (CONSP (val)) |
| 8395 | return val; | 8398 | return val; |
| 8396 | if (SYMBOLP (val) && ! NILP (Fcoding_system_p (val))) | 8399 | if (SYMBOLP (val) && ! NILP (Fcoding_system_p (val))) |