[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xterm.c
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/src/xterm.c |
Date: |
Thu, 27 Jan 2005 12:00:46 -0500 |
Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.857 emacs/src/xterm.c:1.858
*** emacs/src/xterm.c:1.857 Tue Jan 25 01:26:57 2005
--- emacs/src/xterm.c Thu Jan 27 17:00:35 2005
***************
*** 1,6 ****
/* X Communication module for terminals which understand the X protocol.
! Copyright (C) 1989, 93, 94, 95, 96, 97, 98, 1999, 2000,01,02,03,04
! Free Software Foundation, Inc.
This file is part of GNU Emacs.
--- 1,6 ----
/* X Communication module for terminals which understand the X protocol.
! Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
! 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Emacs.
***************
*** 7766,7771 ****
--- 7766,7775 ----
error ("%s", error_msg);
}
+ /* We specifically use it before defining it, so that gcc doesn't inline it,
+ otherwise gdb doesn't know how to properly put a breakpoint on it. */
+ static void x_error_quitter (Display *display, XErrorEvent *error);
+
/* This is the first-level handler for X protocol errors.
It calls x_error_quitter or x_error_catcher. */
***************
*** 7785,7795 ****
It kills all frames on the display that we got the error for.
If that was the only one, it prints an error message and kills Emacs. */
! /* This is not static because we want to put a breakpoint on it.
! It is after x_error_handler so that it won't get inlined in
x_error_handler. */
! void
x_error_quitter (display, error)
Display *display;
XErrorEvent *error;
--- 7789,7798 ----
It kills all frames on the display that we got the error for.
If that was the only one, it prints an error message and kills Emacs. */
! /* It is after x_error_handler so that it won't get inlined in
x_error_handler. */
! static void
x_error_quitter (display, error)
Display *display;
XErrorEvent *error;