procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* term.c (fatal): Undo previous change.
This commit is contained in:
Dan Nicolaescu 2005-10-02 18:35:05 +00:00
parent cde3239fdb
commit eb27c2ca1f
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -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.

2
src/lisp.h
View file

@ -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 */

10
src/term.c
View file

@ -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);
}