Mercurial > hg > xemacs-beta
changeset 2007:65a5016a896f
[xemacs-hg @ 2004-04-12 10:35:11 by stephent]
fix X hangs <877jwl8p3x.fsf@tleepslib.sk.tsukuba.ac.jp>
| author | stephent |
|---|---|
| date | Mon, 12 Apr 2004 10:35:13 +0000 |
| parents | 1ea9c87af805 |
| children | 8364712266dd |
| files | src/ChangeLog src/device-x.c |
| diffstat | 2 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Apr 12 10:11:50 2004 +0000 +++ b/src/ChangeLog Mon Apr 12 10:35:13 2004 +0000 @@ -1,3 +1,7 @@ +2004-01-30 Glynn Clements <glynn.clements@virgin.net> + + * device-x.c (x_error_handler): Don't call stderr_out + 2004-04-08 Jerry James <james@xemacs.org> * data.c: Use #ifndef for functions unused with new number types.
--- a/src/device-x.c Mon Apr 12 10:11:50 2004 +0000 +++ b/src/device-x.c Mon Apr 12 10:35:13 2004 +0000 @@ -786,6 +786,8 @@ validify_resource_component ((char *) XSTRING_DATA (DEVICE_NAME (d)), XSTRING_LENGTH (DEVICE_NAME (d))); + /* #### If we're going to implement X session management, this would + be the place. Make sure it doesn't conflict with GNOME. */ { Arg al[3]; XtSetArg (al[0], XtNvisual, visual); @@ -1081,10 +1083,14 @@ /* #### this should issue a warning instead of outputting to stderr */ depth = begin_dont_check_for_quit (); +#if 0 + /* This ends up calling X, which isn't allowed in an X error handler + */ stderr_out ("\n%s: ", (STRINGP (Vinvocation_name) ? (char *) XSTRING_DATA (Vinvocation_name) : "xemacs")); +#endif XmuPrintDefaultErrorMessage (disp, event, stderr); unbind_to (depth); }