From eb27c2ca1fd09543160e06cc8543f0f3eba83e1e Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Sun, 2 Oct 2005 18:35:05 +0000 Subject: [PATCH] * lisp.h (fatal): Undo previous change. * term.c (fatal): Undo previous change. --- src/ChangeLog | 5 +++++ src/lisp.h | 2 +- src/term.c | 10 ++++------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index f4a999ed70f..351dbcf1e39 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-10-02 Dan Nicolaescu + + * lisp.h (fatal): Undo previous change. + * term.c (fatal): Undo previous change. + 2005-10-01 Richard M. Stallman * xfaces.c (face_color_gray_p): Colors close to black count as gray. diff --git a/src/lisp.h b/src/lisp.h index 57372cfd64f..3ca63554840 100644 --- 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 21333826b3c..2b4ea7e23a4 100644 --- a/src/term.c +++ b/src/term.c @@ -25,7 +25,6 @@ Boston, MA 02110-1301, USA. */ #include #include #include -#include #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); } -- 2.39.5