diff options
| author | Chong Yidong | 2009-06-09 18:26:36 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-06-09 18:26:36 +0000 |
| commit | 0bcbaaaaa8581dc69ddfb7363df3be45c718118f (patch) | |
| tree | b9ac5a755555bb5e6b5a88bef27a44973cfd2aa1 /src | |
| parent | 1f80c7e2bf033821dc32fc93d611932288c5b8a3 (diff) | |
| download | emacs-0bcbaaaaa8581dc69ddfb7363df3be45c718118f.tar.gz emacs-0bcbaaaaa8581dc69ddfb7363df3be45c718118f.zip | |
* process.c (status_message): Fix handling of multibyte signal
string (Bug#3499).
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/process.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1a1068409ac..a62284d5916 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-06-09 Dmitry Dzhus <dima@sphinx.net.ru> (tiny change) | ||
| 2 | |||
| 3 | * process.c (status_message): Fix handling of multibyte signal | ||
| 4 | string (Bug#3499). | ||
| 5 | |||
| 1 | 2009-06-09 Jim Meyering <meyering@redhat.com> | 6 | 2009-06-09 Jim Meyering <meyering@redhat.com> |
| 2 | 7 | ||
| 3 | * xfaces.c (Fx_load_color_file): Avoid array bounds error if the | 8 | * xfaces.c (Fx_load_color_file): Avoid array bounds error if the |
diff --git a/src/process.c b/src/process.c index 5fb3662532d..2471ee187bf 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -464,13 +464,15 @@ status_message (p) | |||
| 464 | if (EQ (symbol, Qsignal) || EQ (symbol, Qstop)) | 464 | if (EQ (symbol, Qsignal) || EQ (symbol, Qstop)) |
| 465 | { | 465 | { |
| 466 | char *signame; | 466 | char *signame; |
| 467 | int c; | ||
| 467 | synchronize_system_messages_locale (); | 468 | synchronize_system_messages_locale (); |
| 468 | signame = strsignal (code); | 469 | signame = strsignal (code); |
| 469 | if (signame == 0) | 470 | if (signame == 0) |
| 470 | signame = "unknown"; | 471 | signame = "unknown"; |
| 471 | string = build_string (signame); | 472 | string = build_string (signame); |
| 472 | string2 = build_string (coredump ? " (core dumped)\n" : "\n"); | 473 | string2 = build_string (coredump ? " (core dumped)\n" : "\n"); |
| 473 | SSET (string, 0, DOWNCASE (SREF (string, 0))); | 474 | c = STRING_CHAR ((char *) SDATA (string), 0); |
| 475 | Faset (string, 0, make_number (DOWNCASE (c))); | ||
| 474 | return concat2 (string, string2); | 476 | return concat2 (string, string2); |
| 475 | } | 477 | } |
| 476 | else if (EQ (symbol, Qexit)) | 478 | else if (EQ (symbol, Qexit)) |