diff options
| author | Miles Bader <miles@gnu.org> | 2007-08-29 05:28:10 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-08-29 05:28:10 +0000 |
| commit | 8d9cc0b7ea1893059df8788129998e9a71ec07f3 (patch) | |
| tree | 4caa326ed8de37c8c0a859c7071593362832d37e /lwlib | |
| parent | cb5b9015b372175f1fc90cb7ba3f43298c621509 (diff) | |
| parent | 5142de65ce179e846514ec7355274ab22822a85c (diff) | |
| download | emacs-8d9cc0b7ea1893059df8788129998e9a71ec07f3.tar.gz | |
Merge multi-tty branch
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-866
Diffstat (limited to 'lwlib')
| -rw-r--r-- | lwlib/ChangeLog | 5 | ||||
| -rw-r--r-- | lwlib/xlwmenu.c | 9 |
2 files changed, 14 insertions, 0 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 6079a3af84a..75597a9549e 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,8 @@ +2007-08-29 Karoly Lorentey <lorentey@elte.hu> + + * xlwmenu.c (XlwMenuRealize): Ignore X errors while setting up + cursor shape. + 2007-07-25 Glenn Morris <rgm@gnu.org> * Relicense all FSF files to GPLv3 or later. diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index b3929d34a35..40a88fcced5 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c @@ -1844,7 +1844,16 @@ XlwMenuRealize (w, valueMask, attributes) xswa.save_under = True; xswa.cursor = mw->menu.cursor_shape; mask = CWSaveUnder | CWCursor; + /* I sometimes get random BadCursor errors while creating the first + frame on a display. I can not find their reason, but they are + annoying so for now let's ignore any errors here. -- lorentey */ +#ifdef emacs + x_catch_errors (XtDisplay (w)); +#endif XChangeWindowAttributes (XtDisplay (w), XtWindow (w), mask, &xswa); +#ifdef emacs + x_uncatch_errors (); +#endif mw->menu.windows [0].window = XtWindow (w); mw->menu.windows [0].x = w->core.x; |