2 files changed, 14 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 439b5c06e27..847e065e1c3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * emacs.c (shut_down_emacs): Don't assume stderr is buffered,
+        or that fprintf is async-signal-safe.  POSIX doesn't require
+        either assumption.
+
 2012-09-22  Chong Yidong  <cyd@gnu.org>
 
         * buffer.c (Fset_buffer_modified_p): Handle indirect buffers
diff --git a/src/emacs.c b/src/emacs.c
index d4b52ab64ea..a483f3848cf 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -27,6 +27,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/file.h>
 #include <unistd.h>
 
+#include <ignore-value.h>
+
 #include "lisp.h"
 
 #ifdef HAVE_WINDOW_SYSTEM
@@ -2012,7 +2014,12 @@ shut_down_emacs (int sig, Lisp_Object stuff)
       {
         reset_all_sys_modes ();
         if (sig && sig != SIGTERM)
-          fprintf (stderr, "Fatal error %d: %s", sig, strsignal (sig));
+          {
+            char buf[100];
+            int buflen = snprintf (buf, sizeof buf, "Fatal error %d: %s",
+                                   sig, strsignal (sig));
+            ignore_value (write (STDERR_FILENO, buf, buflen));
+          }
       }
   }
 #else