aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2021-01-04 10:33:43 -0800
committerPaul Eggert2021-01-04 10:35:19 -0800
commit97226aacfde717ec48fa8931c870497e089da17b (patch)
tree9155f3acab05a3b758608af8c4b1e867b99f3bb6 /src
parentfa574e68dec8255e211fbca95e187083ec6eabb4 (diff)
downloademacs-97226aacfde717ec48fa8931c870497e089da17b.tar.gz
emacs-97226aacfde717ec48fa8931c870497e089da17b.zip
Do not assume Xrender merely because Cairo
Problem reported by Andrea Corallo in: https://lists.gnu.org/r/emacs-devel/2021-01/msg00225.html * src/xterm.c (x_term_init) [USE_CAIRO && !HAVE_XRENDER]: Do not call XRenderQueryExtension.
Diffstat (limited to 'src')
-rw-r--r--src/xterm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 0a86738cc20..b8374fed8b1 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -13035,13 +13035,13 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
13035 or larger than other for other applications, even if it is the same 13035 or larger than other for other applications, even if it is the same
13036 font name (monospace-10 for example). */ 13036 font name (monospace-10 for example). */
13037 13037
13038# ifdef HAVE_XRENDER
13038 int event_base, error_base; 13039 int event_base, error_base;
13039 char *v;
13040 double d;
13041
13042 XRenderQueryExtension (dpyinfo->display, &event_base, &error_base); 13040 XRenderQueryExtension (dpyinfo->display, &event_base, &error_base);
13041# endif
13043 13042
13044 v = XGetDefault (dpyinfo->display, "Xft", "dpi"); 13043 char *v = XGetDefault (dpyinfo->display, "Xft", "dpi");
13044 double d;
13045 if (v != NULL && sscanf (v, "%lf", &d) == 1) 13045 if (v != NULL && sscanf (v, "%lf", &d) == 1)
13046 dpyinfo->resy = dpyinfo->resx = d; 13046 dpyinfo->resy = dpyinfo->resx = d;
13047 } 13047 }