Mercurial > emacs
changeset 65795:4b20a22635a5
* lisp.h (fatal): Undo previous change.
* term.c (fatal): Undo previous change.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sun, 02 Oct 2005 18:35:05 +0000 |
| parents | 3dea674724d0 |
| children | d0393b4336d0 |
| files | src/ChangeLog src/lisp.h src/term.c |
| diffstat | 3 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Oct 02 17:44:18 2005 +0000 +++ b/src/ChangeLog Sun Oct 02 18:35:05 2005 +0000 @@ -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.
--- a/src/lisp.h Sun Oct 02 17:44:18 2005 +0000 +++ b/src/lisp.h Sun Oct 02 18:35:05 2005 +0000 @@ -3158,7 +3158,7 @@ /* 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 */
--- a/src/term.c Sun Oct 02 17:44:18 2005 +0000 +++ b/src/term.c Sun Oct 02 18:35:05 2005 +0000 @@ -25,7 +25,6 @@ #include <stdio.h> #include <ctype.h> #include <string.h> -#include <stdarg.h> #include "termchar.h" #include "termopts.h" @@ -2690,13 +2689,12 @@ /* 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); }