aboutsummaryrefslogtreecommitdiffstats
path: root/src/xterm.c
diff options
context:
space:
mode:
authorGlenn Morris2020-01-08 09:09:47 -0800
committerGlenn Morris2020-01-08 09:09:47 -0800
commitb968b733a2a0450eb7312a5e72c059ec3c59ddd9 (patch)
treeda0790ada823a4d7dee009e9df63b3b24d0d539b /src/xterm.c
parentf8a0b02949342b887822e7756fd36f06536c9c01 (diff)
parent6cd9ccb0a28ec03ffe180b7429e0378511b7d459 (diff)
downloademacs-b968b733a2a0450eb7312a5e72c059ec3c59ddd9.tar.gz
emacs-b968b733a2a0450eb7312a5e72c059ec3c59ddd9.zip
Merge from origin/emacs-27
6cd9ccb0a2 (origin/emacs-27) Fix compression of directories in Dired 42329e6d3b ; * etc/NEWS: Review of the whole text. af5709f16b Further enhancement on `tramp-file-local-name' fb432446f5 Objective C Mode imenu: cease recognizing "functions" with... a18373a999 ; * etc/NEWS: Update the text about the XDG_CONFIG_HOME/em... 73fd8a4b53 Fix BSD and macOS builds w.r.t. pthread_setname_np (bug#38... f54b24304d Scale top-left coordinates in display-monitor-attributes-list b46c75b16c xref-matches-in-files: Big Tramp speed-up 883b3490d8 * lisp/net/tramp.el (tramp-file-local-name): Remove `save-... c01f55f126 Fix rendering bug due to unsynchronized cairo surface size... 075f21c0e3 Avoid crash by access to cleared img->pixmap->data/img->ma... 16c6dfb4f1 Avoid assertion violations in very small-height windows 9063124b91 Use pthread_setname_np to set thread name # Conflicts: # etc/NEWS # lisp/net/tramp.el
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xterm.c b/src/xterm.c
index ada3cec1636..21d99f0c7bb 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8934,6 +8934,10 @@ handle_one_xevent (struct x_display_info *dpyinfo,
8934 if (f) 8934 if (f)
8935 x_cr_update_surface_desired_size (f, configureEvent.xconfigure.width, 8935 x_cr_update_surface_desired_size (f, configureEvent.xconfigure.width,
8936 configureEvent.xconfigure.height); 8936 configureEvent.xconfigure.height);
8937 else if (any && configureEvent.xconfigure.window == FRAME_X_WINDOW (any))
8938 x_cr_update_surface_desired_size (any,
8939 configureEvent.xconfigure.width,
8940 configureEvent.xconfigure.height);
8937#endif 8941#endif
8938#ifdef USE_GTK 8942#ifdef USE_GTK
8939 if (!f 8943 if (!f