1 files changed, 21 insertions, 25 deletions

diff --git a/src/term.c b/src/term.c
index 8b5a710d80a..b058d8bdad0 100644
--- a/src/term.c
+++ b/src/term.c
@@ -145,7 +145,7 @@ tty_ring_bell (struct frame *f)
       OUTPUT (tty, (tty->TS_visible_bell && visible_bell
                     ? tty->TS_visible_bell
                     : tty->TS_bell));
-      fflush_unlocked (tty->output);
+      fflush (tty->output);
     }
 }
 
@@ -170,10 +170,9 @@ tty_send_additional_strings (struct terminal *terminal, Lisp_Object sym)
       Lisp_Object string = XCAR (extra_codes);
       if (STRINGP (string))
         {
-	  fwrite_unlocked (SDATA (string), 1, SBYTES (string), tty->output);
+	  fwrite (SDATA (string), 1, SBYTES (string), tty->output);
           if (tty->termscript)
-	    fwrite_unlocked (SDATA (string), 1, SBYTES (string),
-			     tty->termscript);
+	    fwrite (SDATA (string), 1, SBYTES (string), tty->termscript);
         }
     }
 }
@@ -201,7 +200,7 @@ tty_set_terminal_modes (struct terminal *terminal)
       OUTPUT_IF (tty, tty->TS_keypad_mode);
       losecursor (tty);
       tty_send_additional_strings (terminal, Qtty_mode_set_strings);
-      fflush_unlocked (tty->output);
+      fflush (tty->output);
     }
 }
 
@@ -224,7 +223,7 @@ tty_reset_terminal_modes (struct terminal *terminal)
       /* Output raw CR so kernel can track the cursor hpos.  */
       current_tty = tty;
       cmputc ('\r');
-      fflush_unlocked (tty->output);
+      fflush (tty->output);
     }
 }
 
@@ -239,7 +238,7 @@ tty_update_end (struct frame *f)
     tty_show_cursor (tty);
   tty_turn_off_insert (tty);
   tty_background_highlight (tty);
-  fflush_unlocked (tty->output);
+  fflush (tty->output);
 }
 
 /* The implementation of set_terminal_window for termcap frames. */
@@ -501,8 +500,8 @@ tty_clear_end_of_line (struct frame *f, int first_unused_hpos)
       for (i = curX (tty); i < first_unused_hpos; i++)
 	{
 	  if (tty->termscript)
-	    fputc_unlocked (' ', tty->termscript);
-	  fputc_unlocked (' ', tty->output);
+	    putc (' ', tty->termscript);
+	  putc (' ', tty->output);
 	}
       cmplus (tty, first_unused_hpos - curX (tty));
     }
@@ -775,11 +774,10 @@ tty_write_glyphs (struct frame *f, struct glyph *string, int len)
       if (coding->produced > 0)
 	{
 	  block_input ();
-	  fwrite_unlocked (conversion_buffer, 1, coding->produced, tty->output);
-	  clearerr_unlocked (tty->output);
+	  fwrite (conversion_buffer, 1, coding->produced, tty->output);
+	  clearerr (tty->output);
 	  if (tty->termscript)
-	    fwrite_unlocked (conversion_buffer, 1, coding->produced,
-			     tty->termscript);
+	    fwrite (conversion_buffer, 1, coding->produced, tty->termscript);
 	  unblock_input ();
 	}
       string += n;
@@ -836,11 +834,10 @@ tty_write_glyphs_with_face (register struct frame *f, register struct glyph *str
   if (coding->produced > 0)
     {
       block_input ();
-      fwrite_unlocked (conversion_buffer, 1, coding->produced, tty->output);
-      clearerr_unlocked (tty->output);
+      fwrite (conversion_buffer, 1, coding->produced, tty->output);
+      clearerr (tty->output);
       if (tty->termscript)
-	fwrite_unlocked (conversion_buffer, 1, coding->produced,
-			 tty->termscript);
+	fwrite (conversion_buffer, 1, coding->produced, tty->termscript);
       unblock_input ();
     }
 
@@ -922,11 +919,10 @@ tty_insert_glyphs (struct frame *f, struct glyph *start, int len)
       if (coding->produced > 0)
 	{
 	  block_input ();
-	  fwrite_unlocked (conversion_buffer, 1, coding->produced, tty->output);
-	  clearerr_unlocked (tty->output);
+	  fwrite (conversion_buffer, 1, coding->produced, tty->output);
+	  clearerr (tty->output);
 	  if (tty->termscript)
-	    fwrite_unlocked (conversion_buffer, 1, coding->produced,
-			     tty->termscript);
+	    fwrite (conversion_buffer, 1, coding->produced, tty->termscript);
 	  unblock_input ();
 	}
 
@@ -3331,7 +3327,7 @@ tty_menu_activate (tty_menu *menu, int *pane, int *selidx,
 	 which calls tty_show_cursor.  Re-hide it, so it doesn't show
 	 through the menus.  */
       tty_hide_cursor (tty);
-      fflush_unlocked (tty->output);
+      fflush (tty->output);
     }
 
   sf->mouse_moved = 0;
@@ -3339,7 +3335,7 @@ tty_menu_activate (tty_menu *menu, int *pane, int *selidx,
   while (statecount--)
     free_saved_screen (state[statecount].screen_behind);
   tty_show_cursor (tty);	/* Turn cursor back on.  */
-  fflush_unlocked (tty->output);
+  fflush (tty->output);
 
 /* Clean up any mouse events that are waiting inside Emacs event queue.
      These events are likely to be generated before the menu was even
@@ -4398,10 +4394,10 @@ use the Bourne shell command 'TERM=...; export TERM' (C-shell:\n\
 static void
 vfatal (const char *str, va_list ap)
 {
-  fprintf (stderr, "emacs: ");
+  fputs ("emacs: ", stderr);
   vfprintf (stderr, str, ap);
   if (! (str[0] && str[strlen (str) - 1] == '\n'))
-    fprintf (stderr, "\n");
+    putc ('\n', stderr);
   exit (1);
 }