* lisp.h (fatal): Undo previous change.

* term.c (fatal): Undo previous change.

diff --git a/src/ChangeLog b/src/ChangeLog
index f4a999ed70fcf7d569ccd9fba493f34e93d3987e..351dbcf1e39dd1b516a8df83207371c98934196f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-02  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * lisp.h (fatal): Undo previous change.
+       * term.c (fatal): Undo previous change.
+
 2005-10-01  Richard M. Stallman  <rms@gnu.org>
 
        * xfaces.c (face_color_gray_p): Colors close to black count as gray.

diff --git a/src/lisp.h b/src/lisp.h
index 57372cfd64f8b9cce1f3c5c52cb7cdb599d59a6f..3ca6355484041d797e59659924a1f6c087fda112 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3158,7 +3158,7 @@ extern void syms_of_dired P_ ((void));
 
 /* Defined in term.c */
 extern void syms_of_term P_ ((void));
-extern void fatal P_ ((const char *msgid, ...)) NO_RETURN;
+extern void fatal () NO_RETURN;
 
 #ifdef HAVE_X_WINDOWS
 /* Defined in fontset.c */

diff --git a/src/term.c b/src/term.c
index 21333826b3c1ce2163f613a19474e7d87a8f78bf..2b4ea7e23a4d53da96a133d96a53ff0b36a9446e 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -25,7 +25,6 @@ Boston, MA 02110-1301, USA.  */
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
-#include <stdarg.h>
 
 #include "termchar.h"
 #include "termopts.h"
@@ -2690,13 +2689,12 @@ to do `unset TERMCAP' (C-shell: `unsetenv TERMCAP') as well.",
 
 /* VARARGS 1 */
 void
-fatal (const char *str, ...)
+fatal (str, arg1, arg2)
+     char *str, *arg1, *arg2;
 {
-  va_list ap;
-  va_start (ap, str);
   fprintf (stderr, "emacs: ");
-  vfprintf (stderr, str, ap);
-  va_end (ap);
+  fprintf (stderr, str, arg1, arg2);
+  fprintf (stderr, "\n");
   fflush (stderr);
   exit (1);
 }