[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xterm.c,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/src/xterm.c,v |
Date: |
Sun, 22 Jun 2008 14:02:08 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 08/06/22 14:02:07
Index: xterm.c
===================================================================
RCS file: /sources/emacs/emacs/src/xterm.c,v
retrieving revision 1.998
retrieving revision 1.999
diff -u -b -r1.998 -r1.999
--- xterm.c 10 Jun 2008 20:22:10 -0000 1.998
+++ xterm.c 22 Jun 2008 14:02:07 -0000 1.999
@@ -497,26 +497,32 @@
{
unsigned char *data;
Atom actual;
- int format;
+ int rc, format;
unsigned long n, left;
- XGetWindowProperty(dpy, win, XInternAtom(dpy, OPACITY, False),
- 0L, 1L, False, XA_CARDINAL, &actual, &format, &n, &left,
+ x_catch_errors (dpy);
+ rc = XGetWindowProperty(dpy, win, XInternAtom(dpy, OPACITY, False),
+ 0L, 1L, False, XA_CARDINAL,
+ &actual, &format, &n, &left,
&data);
- if (actual != None)
+
+ if (rc == Success && actual != None)
if (*(unsigned long *)data == opac)
{
XFree ((void *) data);
+ x_uncatch_errors ();
return;
}
else
XFree ((void *) data);
+ x_uncatch_errors ();
}
+ x_catch_errors (dpy);
XChangeProperty (dpy, win, XInternAtom (dpy, OPACITY, False),
XA_CARDINAL, 32, PropModeReplace,
(unsigned char *) &opac, 1L);
- XSync (dpy, False);
+ x_uncatch_errors ();
}