Mercurial > hg > xemacs-beta
changeset 3413:e13aec8357bb
[xemacs-hg @ 2006-05-22 20:27:57 by aidan]
Prevent a crash with a debug XEmacs and mule.
| author | aidan |
|---|---|
| date | Mon, 22 May 2006 20:28:01 +0000 |
| parents | 88b62bce19cf |
| children | aa21e817df76 |
| files | src/ChangeLog src/file-coding.c |
| diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun May 21 21:51:14 2006 +0000 +++ b/src/ChangeLog Mon May 22 20:28:01 2006 +0000 @@ -1,3 +1,9 @@ +2006-05-22 Aidan Kehoe <kehoea@parhasard.net> + + * file-coding.c (output_bytes_in_ascii_and_hex): + Pass stderr_out internally-formatted data, don't use an external + format. + 2006-05-21 Aidan Kehoe <kehoea@parhasard.net> * doc.c (extract_object_file_name):
--- a/src/file-coding.c Sun May 21 21:51:14 2006 +0000 +++ b/src/file-coding.c Mon May 22 20:28:01 2006 +0000 @@ -3370,6 +3370,8 @@ UExtbyte *ascii = alloca_array (UExtbyte, n + 1); UExtbyte *hex = alloca_array (UExtbyte, 3 * n + 1); int i; + DECLARE_EISTRING (eistr_ascii); + DECLARE_EISTRING (eistr_hex); for (i = 0; i < n; i++) { @@ -3384,7 +3386,11 @@ } ascii[i] = '\0'; hex[3 * i - 1] = '\0'; - stderr_out ("%s %s", ascii, hex); + + eicpy_ext(eistr_hex, hex, Qbinary); + eicpy_ext(eistr_ascii, ascii, Qbinary); + + stderr_out ("%s %s", eidata(eistr_ascii), eidata(eistr_hex)); } #endif /* DEBUG_XEMACS */