From: Yuuki Harano <masm+github@masm11.me>
Date: Mon, 3 May 2021 12:33:53 +0000 (+0900)
Subject: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
X-Git-Tag: emacs-29.0.90~3710
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=704b765eaaee82176e26ab084c26d65311fd46d3;p=emacs.git

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
---

704b765eaaee82176e26ab084c26d65311fd46d3
diff --cc src/gtkutil.c
index 897eade8503,ba506faf356..81033b2b12b
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@@ -1183,16 -1037,8 +1191,10 @@@ xg_frame_set_char_size (struct frame *f
        /* Must call this to flush out events */
        (void)gtk_events_pending ();
        gdk_flush ();
 +#ifndef HAVE_PGTK
        x_wait_for_event (f, ConfigureNotify);
 +#endif
  
-       if (CONSP (frame_size_history))
- 	frame_size_history_extra
- 	  (f, build_string ("xg_frame_set_char_size, visible"),
- 	   FRAME_PIXEL_WIDTH (f), FRAME_PIXEL_HEIGHT (f), width, height,
- 	   f->new_width, f->new_height);
- 
        if (!NILP (fullscreen))
  	/* Try to restore fullscreen state.  */
  	{