aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2010-04-12 20:58:15 +0200
committerJan Djärv2010-04-12 20:58:15 +0200
commit83725342d558e526bf31cb9bdcb10d5d8870e1d2 (patch)
treee99ec725e2e6fcac4fe2df967ac41b7ee237af45
parent398a825b8d994882672906103f330ad8662d1ed6 (diff)
downloademacs-83725342d558e526bf31cb9bdcb10d5d8870e1d2.tar.gz
emacs-83725342d558e526bf31cb9bdcb10d5d8870e1d2.zip
xfns.c (select_visual): Don't call error if XGetVisualInfo returns
more than one visual (Bug#5938).
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xfns.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6d19b2e1e9a..7bbbc04d056 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12010-04-12 Jan Djärv <jan.h.d@swipnet.se>
2
3 * xfns.c (select_visual): Don't call error if XGetVisualInfo returns
4 more than one visual (Bug#5938).
5
12010-04-12 Dan Nicolaescu <dann@ics.uci.edu> 62010-04-12 Dan Nicolaescu <dann@ics.uci.edu>
2 7
3 * Makefile.in (C_SWITCH_SYSTEM,C_SWITCH_MACHINE,C_SWITCH_X_SITE): Undefine. 8 * Makefile.in (C_SWITCH_SYSTEM,C_SWITCH_MACHINE,C_SWITCH_X_SITE): Undefine.
diff --git a/src/xfns.c b/src/xfns.c
index e02174e55fa..ea88c840d54 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4129,7 +4129,7 @@ select_visual (dpyinfo)
4129 vinfo_template.screen = XScreenNumberOfScreen (screen); 4129 vinfo_template.screen = XScreenNumberOfScreen (screen);
4130 vinfo = XGetVisualInfo (dpy, VisualIDMask | VisualScreenMask, 4130 vinfo = XGetVisualInfo (dpy, VisualIDMask | VisualScreenMask,
4131 &vinfo_template, &n_visuals); 4131 &vinfo_template, &n_visuals);
4132 if (n_visuals != 1) 4132 if (n_visuals <= 0)
4133 fatal ("Can't get proper X visual info"); 4133 fatal ("Can't get proper X visual info");
4134 4134
4135 dpyinfo->n_planes = vinfo->depth; 4135 dpyinfo->n_planes = vinfo->depth;