diff options
| author | Eli Zaretskii | 2011-04-27 21:15:29 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2011-04-27 21:15:29 +0300 |
| commit | 94dcfacf129aa99be3e375187d75a193ffe26bad (patch) | |
| tree | 69ae809354575f22d35c37d15a311242ea032ca1 /src/coding.c | |
| parent | 211ec9072dc2635bf027ae6b3c58a3edf27e5969 (diff) | |
| download | emacs-94dcfacf129aa99be3e375187d75a193ffe26bad.tar.gz emacs-94dcfacf129aa99be3e375187d75a193ffe26bad.zip | |
Improve `doprnt' and its usage. (Bug#8545)
src/doprnt.c (doprnt): Make sure `format' is never accessed beyond
`format_end'. Remove support for %l as a conversion specifier.
Don't use xrealloc. Improve diagnostics when the %l size modifier
is used. Update the commentary.
src/eval.c (verror): Simplify calculation of size_t.
src/coding.c (Ffind_operation_coding_system): Fix diagnostic error
messages.
Diffstat (limited to 'src/coding.c')
| -rw-r--r-- | src/coding.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/coding.c b/src/coding.c index c14a41036ac..c129c94203c 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -9282,14 +9282,15 @@ usage: (find-operation-coding-system OPERATION ARGUMENTS...) */) | |||
| 9282 | || !NATNUMP (target_idx = Fget (operation, Qtarget_idx))) | 9282 | || !NATNUMP (target_idx = Fget (operation, Qtarget_idx))) |
| 9283 | error ("Invalid first argument"); | 9283 | error ("Invalid first argument"); |
| 9284 | if (nargs < 1 + XFASTINT (target_idx)) | 9284 | if (nargs < 1 + XFASTINT (target_idx)) |
| 9285 | error ("Too few arguments for operation: %s", | 9285 | error ("Too few arguments for operation `%s'", |
| 9286 | SDATA (SYMBOL_NAME (operation))); | 9286 | SDATA (SYMBOL_NAME (operation))); |
| 9287 | target = args[XFASTINT (target_idx) + 1]; | 9287 | target = args[XFASTINT (target_idx) + 1]; |
| 9288 | if (!(STRINGP (target) | 9288 | if (!(STRINGP (target) |
| 9289 | || (EQ (operation, Qinsert_file_contents) && CONSP (target) | 9289 | || (EQ (operation, Qinsert_file_contents) && CONSP (target) |
| 9290 | && STRINGP (XCAR (target)) && BUFFERP (XCDR (target))) | 9290 | && STRINGP (XCAR (target)) && BUFFERP (XCDR (target))) |
| 9291 | || (EQ (operation, Qopen_network_stream) && INTEGERP (target)))) | 9291 | || (EQ (operation, Qopen_network_stream) && INTEGERP (target)))) |
| 9292 | error ("Invalid %"pI"dth argument", XFASTINT (target_idx) + 1); | 9292 | error ("Invalid argument %"pI"d of operation `%s'", |
| 9293 | XFASTINT (target_idx) + 1, SDATA (SYMBOL_NAME (operation))); | ||
| 9293 | if (CONSP (target)) | 9294 | if (CONSP (target)) |
| 9294 | target = XCAR (target); | 9295 | target = XCAR (target); |
| 9295 | 9296 | ||